diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java
index 04a7d58b4f..6d4fb8eb67 100644
--- a/app/src/main/java/eu/faircode/email/ActivityView.java
+++ b/app/src/main/java/eu/faircode/email/ActivityView.java
@@ -130,8 +130,8 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
     static final String ACTION_VIEW_MESSAGES = BuildConfig.APPLICATION_ID + ".VIEW_MESSAGES";
     static final String ACTION_SEARCH_ADDRESS = BuildConfig.APPLICATION_ID + ".SEARCH_ADDRESS";
     static final String ACTION_VIEW_THREAD = BuildConfig.APPLICATION_ID + ".VIEW_THREAD";
-    static final String ACTION_VIEW_OUTBOX = BuildConfig.APPLICATION_ID + ".VIEW_OUTBOX";
     static final String ACTION_EDIT_FOLDER = BuildConfig.APPLICATION_ID + ".EDIT_FOLDER";
+    static final String ACTION_VIEW_OUTBOX = BuildConfig.APPLICATION_ID + ".VIEW_OUTBOX";
     static final String ACTION_EDIT_ANSWERS = BuildConfig.APPLICATION_ID + ".EDIT_ANSWERS";
     static final String ACTION_EDIT_ANSWER = BuildConfig.APPLICATION_ID + ".EDIT_ANSWER";
     static final String ACTION_EDIT_RULES = BuildConfig.APPLICATION_ID + ".EDIT_RULES";
@@ -646,8 +646,8 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
         iff.addAction(ACTION_VIEW_MESSAGES);
         iff.addAction(ACTION_SEARCH_ADDRESS);
         iff.addAction(ACTION_VIEW_THREAD);
-        iff.addAction(ACTION_VIEW_OUTBOX);
         iff.addAction(ACTION_EDIT_FOLDER);
+        iff.addAction(ACTION_VIEW_OUTBOX);
         iff.addAction(ACTION_EDIT_ANSWERS);
         iff.addAction(ACTION_EDIT_ANSWER);
         iff.addAction(ACTION_EDIT_RULES);
@@ -1336,10 +1336,10 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
                     onSearchAddress(intent);
                 else if (ACTION_VIEW_THREAD.equals(action))
                     onViewThread(intent);
-                else if (ACTION_VIEW_OUTBOX.equals(action))
-                    onMenuOutbox();
                 else if (ACTION_EDIT_FOLDER.equals(action))
                     onEditFolder(intent);
+                else if (ACTION_VIEW_OUTBOX.equals(action))
+                    onMenuOutbox();
                 else if (ACTION_EDIT_ANSWERS.equals(action))
                     onEditAnswers(intent);
                 else if (ACTION_EDIT_ANSWER.equals(action))