diff --git a/mail/common/src/main/java/com/fsck/k9/mail/store/StoreConfig.java b/mail/common/src/main/java/com/fsck/k9/mail/store/StoreConfig.java
index 43f668be9..03112a926 100644
--- a/mail/common/src/main/java/com/fsck/k9/mail/store/StoreConfig.java
+++ b/mail/common/src/main/java/com/fsck/k9/mail/store/StoreConfig.java
@@ -7,7 +7,6 @@ public interface StoreConfig {
     boolean isSubscribedFoldersOnly();
     boolean useCompression(NetworkType type);
 
-    String getOutboxFolder();
     String getDraftsFolder();
 
     int getMaximumAutoDownloadMessageSize();
diff --git a/mail/protocols/imap/src/main/java/com/fsck/k9/mail/store/imap/ImapStore.java b/mail/protocols/imap/src/main/java/com/fsck/k9/mail/store/imap/ImapStore.java
index 14369354f..7bf55249a 100644
--- a/mail/protocols/imap/src/main/java/com/fsck/k9/mail/store/imap/ImapStore.java
+++ b/mail/protocols/imap/src/main/java/com/fsck/k9/mail/store/imap/ImapStore.java
@@ -187,7 +187,7 @@ public class ImapStore {
 
             if (ImapFolder.INBOX.equalsIgnoreCase(serverId)) {
                 continue;
-            } else if (serverId.equals(storeConfig.getOutboxFolder())) {
+            } else if (serverId.equals("K9MAIL_INTERNAL_OUTBOX")) {
                 /*
                  * There is a folder on the server with the same name as our local
                  * outbox. Until we have a good plan to deal with this situation