diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 4c137e21..59a70237 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -394,13 +394,16 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
                         @Override
                         public void onChanged(@Nullable List<TupleFolderEx> folders) {
                             if (bnvActions.hasTransientState()) {
+                                boolean hasJunk = false;
                                 boolean hasTrash = false;
                                 boolean hasArchive = false;
                                 boolean hasUser = false;
 
                                 if (folders != null)
                                     for (EntityFolder folder : folders) {
-                                        if (EntityFolder.TRASH.equals(folder.type))
+                                        if (EntityFolder.JUNK.equals(folder.type))
+                                            hasJunk = true;
+                                        else if (EntityFolder.TRASH.equals(folder.type))
                                             hasTrash = true;
                                         else if (EntityFolder.ARCHIVE.equals(folder.type))
                                             hasArchive = true;
@@ -414,6 +417,7 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
                                 boolean inTrash = EntityFolder.TRASH.equals(message.folderType);
 
                                 ActionData data = new ActionData();
+                                data.hasJunk = hasJunk;
                                 data.delete = (inTrash || !hasTrash || inOutbox);
                                 data.message = message;
                                 bnvActions.setTag(data);
@@ -421,7 +425,9 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
                                 bnvActions.getMenu().findItem(R.id.action_delete).setVisible((message.uid != null && hasTrash) || (inOutbox && !TextUtils.isEmpty(message.error)));
                                 bnvActions.getMenu().findItem(R.id.action_move).setVisible(message.uid != null && (!inInbox || hasUser));
                                 bnvActions.getMenu().findItem(R.id.action_archive).setVisible(message.uid != null && !inArchive && hasArchive);
-                                bnvActions.getMenu().findItem(R.id.action_reply).setVisible(message.content && !inOutbox);
+
+                                bnvActions.getMenu().findItem(R.id.action_reply).setEnabled(message.content);
+                                bnvActions.getMenu().findItem(R.id.action_reply).setVisible(!inOutbox);
 
                                 bnvActions.setVisibility(View.VISIBLE);
                                 vSeparatorBody.setVisibility(View.GONE);
@@ -758,6 +764,7 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
         }
 
         private class ActionData {
+            boolean hasJunk;
             boolean delete;
             TupleMessageEx message;
         }
@@ -1033,12 +1040,26 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
             View anchor = bnvActions.findViewById(R.id.action_more);
             PopupMenu popupMenu = new PopupMenu(context, anchor);
             popupMenu.inflate(R.menu.menu_message);
-            popupMenu.getMenu().findItem(R.id.menu_forward).setVisible(data.message.content && !inOutbox);
+            popupMenu.getMenu().findItem(R.id.menu_junk).setVisible(data.message.uid != null && data.hasJunk && !inOutbox);
+
+            popupMenu.getMenu().findItem(R.id.menu_forward).setEnabled(data.message.content);
+            popupMenu.getMenu().findItem(R.id.menu_forward).setVisible(!inOutbox);
+
+            popupMenu.getMenu().findItem(R.id.menu_reply_all).setEnabled(data.message.content);
+            popupMenu.getMenu().findItem(R.id.menu_reply_all).setVisible(!inOutbox);
+
             popupMenu.getMenu().findItem(R.id.menu_show_headers).setChecked(show_headers);
-            popupMenu.getMenu().findItem(R.id.menu_show_headers).setEnabled(data.message.uid != null);
+            popupMenu.getMenu().findItem(R.id.menu_show_headers).setVisible(data.message.uid != null);
+
             popupMenu.getMenu().findItem(R.id.menu_show_html).setEnabled(data.message.content && Helper.classExists("android.webkit.WebView"));
-            popupMenu.getMenu().findItem(R.id.menu_flag).setChecked(data.message.uid != null && data.message.unflagged != 1);
-            popupMenu.getMenu().findItem(R.id.menu_reply_all).setVisible(data.message.content && !inOutbox);
+
+            popupMenu.getMenu().findItem(R.id.menu_flag).setChecked(data.message.unflagged != 1);
+            popupMenu.getMenu().findItem(R.id.menu_flag).setVisible(data.message.uid != null && !inOutbox);
+
+            popupMenu.getMenu().findItem(R.id.menu_unseen).setVisible(data.message.uid != null && !inOutbox);
+
+            popupMenu.getMenu().findItem(R.id.menu_answer).setEnabled(data.message.content);
+            popupMenu.getMenu().findItem(R.id.menu_answer).setVisible(!inOutbox);
 
             popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
                 @Override
@@ -1202,7 +1223,7 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
                         folders.add(0, sent);
 
                     EntityFolder inbox = db.folder().getFolderByType(message.account, EntityFolder.INBOX);
-                    if (!message.folder.equals(inbox.id))
+                    if (inbox != null && !message.folder.equals(inbox.id))
                         folders.add(0, inbox);
 
                     return folders;
diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index d3c3e3cb..dad965f7 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -844,7 +844,7 @@ public class FragmentCompose extends FragmentEx {
                 if (drafts == null)
                     drafts = db.folder().getPrimaryDrafts();
                 if (drafts == null)
-                    throw new IllegalArgumentException("no drafts folder");
+                    throw new IllegalArgumentException(getString(R.string.title_no_drafts));
 
                 String body = "";
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 5447e121..d7d13387 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -338,21 +338,20 @@ public class FragmentMessages extends FragmentEx {
                             EntityMessage message = db.message().getMessage(id);
                             EntityFolder folder = db.folder().getFolder(message.folder);
 
-                            if (swipeTarget >= 0 && direction == ItemTouchHelper.RIGHT)
-                                target = db.folder().getFolder(swipeTarget);
-
-                            if (target == null || !target.account.equals((message.account))) {
+                            if (swipeTarget < 0 || direction == ItemTouchHelper.LEFT) {
                                 if (EntityFolder.ARCHIVE.equals(folder.type) || EntityFolder.TRASH.equals(folder.type))
                                     target = db.folder().getFolderByType(message.account, EntityFolder.INBOX);
                                 else {
                                     if (direction == ItemTouchHelper.RIGHT)
                                         target = db.folder().getFolderByType(message.account, EntityFolder.ARCHIVE);
-                                    if (direction == ItemTouchHelper.LEFT || target == null)
+                                    else if (direction == ItemTouchHelper.LEFT)
                                         target = db.folder().getFolderByType(message.account, EntityFolder.TRASH);
-                                    if (target == null)
-                                        target = db.folder().getFolderByType(message.account, EntityFolder.INBOX);
                                 }
-                            }
+                            } else
+                                target = db.folder().getFolder(swipeTarget);
+
+                            if (target == null || !target.account.equals((message.account)))
+                                throw new IllegalArgumentException(getString(R.string.title_no_target));
 
                             result.target = target.name;
                             result.display = (target.display == null ? target.name : target.display);
@@ -816,7 +815,7 @@ public class FragmentMessages extends FragmentEx {
                     folders.add(0, sent);
 
                 EntityFolder inbox = db.folder().getFolderByType(folder.account, EntityFolder.INBOX);
-                if (!inbox.id.equals(fid))
+                if (inbox != null && !inbox.id.equals(fid))
                     folders.add(0, inbox);
 
                 return folders;
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a8aed39a..1c9a911d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -126,6 +126,7 @@
     <string name="title_no_password">Password missing</string>
     <string name="title_no_drafts">No primary account or no drafts folder</string>
     <string name="title_no_archive">No primary account or no archive folder</string>
+    <string name="title_no_target">Target folder not set or missing</string>
     <string name="title_no_idle">This provider does not support push messages. Reception of new messages can be delayed.</string>
     <string name="title_no_uidplus">IMAP UIDPLUS not supported, see the FAQ</string>
     <string name="title_account_delete">Delete this account permanently?</string>