diff --git a/app/src/main/java/eu/faircode/email/ActivityBase.java b/app/src/main/java/eu/faircode/email/ActivityBase.java
index eef0823c64..7758a265c5 100644
--- a/app/src/main/java/eu/faircode/email/ActivityBase.java
+++ b/app/src/main/java/eu/faircode/email/ActivityBase.java
@@ -61,7 +61,11 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         Log.i("Create " + this.getClass().getName() + " version=" + BuildConfig.VERSION_NAME);
-        Log.logExtras(getIntent());
+        Intent intent = getIntent();
+        if (intent != null) {
+            Log.i(intent.toString());
+            Log.logBundle(intent.getExtras());
+        }
 
         this.contacts = hasPermission(Manifest.permission.READ_CONTACTS);
 
diff --git a/app/src/main/java/eu/faircode/email/ActivityCompose.java b/app/src/main/java/eu/faircode/email/ActivityCompose.java
index 0e57de27f8..5c4e45917b 100644
--- a/app/src/main/java/eu/faircode/email/ActivityCompose.java
+++ b/app/src/main/java/eu/faircode/email/ActivityCompose.java
@@ -66,8 +66,6 @@ public class ActivityCompose extends ActivityBilling implements FragmentManager.
                     Intent.ACTION_SENDTO.equals(action) ||
                     Intent.ACTION_SEND.equals(action) ||
                     Intent.ACTION_SEND_MULTIPLE.equals(action)) {
-                Log.i(intent.toString());
-                Log.logExtras(intent);
 
                 args = new Bundle();
                 args.putString("action", "new");