diff --git a/app/src/main/java/eu/faircode/email/ServiceSend.java b/app/src/main/java/eu/faircode/email/ServiceSend.java
index 1ae55e2cec..03274287f5 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSend.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSend.java
@@ -569,7 +569,9 @@ public class ServiceSend extends ServiceBase implements SharedPreferences.OnShar
                 for (EntityMessage m : replied)
                     if (!m.ui_hide) {
                         EntityFolder folder = db.folder().getFolder(m.folder);
-                        if (folder != null && EntityFolder.USER.equals(folder.type)) {
+                        if (folder != null &&
+                                (EntityFolder.INBOX.equals(folder.type) ||
+                                        EntityFolder.USER.equals(folder.type))) {
                             sent = folder;
                             break;
                         }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 921434ce18..faa3b20b77 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -399,7 +399,7 @@
     <string name="title_advanced_signature_reply">Use signature when replying</string>
     <string name="title_advanced_signature_forward">Use signature when forwarding</string>
     <string name="title_advanced_discard_delete">On discard draft permanently delete draft</string>
-    <string name="title_advanced_reply_move">On replying to a message in a user folder, save the reply in the same folder</string>
+    <string name="title_advanced_reply_move">On replying to a message, save the reply in the same folder</string>
 
     <string name="title_advanced_auto_link">Automatically create links</string>
     <string name="title_advanced_plain_only">Send plain text only by default</string>