Merge branch 'hardcoded_outbox' into HEAD

res/values-ca/strings.xml

@@ -182,7 +182,6 @@
     <string name="special_mailbox_name_spam">Brossa</string>
     <!-- Mailbox names displayed to user -->
 
-    <string name="special_mailbox_name_outbox_fmt"><xliff:g id="folder">%s</xliff:g> (Bústia de sortida)</string>
     <string name="special_mailbox_name_drafts_fmt"><xliff:g id="folder">%s</xliff:g> (Esborranys)</string>
     <string name="special_mailbox_name_trash_fmt"><xliff:g id="folder">%s</xliff:g> (Paperera)</string>
     <string name="special_mailbox_name_sent_fmt"><xliff:g id="folder">%s</xliff:g> (Enviat)</string>
@@ -435,7 +434,6 @@ Benvingut a la configuració del K-9.  El K-9 és un client de codi obert per An
     <string name="trash_folder_label">Carpeta paperera</string>
     <string name="archive_folder_label">Carpeta arxiu</string>
     <string name="spam_folder_label">Carpeta brossa</string>
-    <string name="outbox_folder_label">Carpeta sortida</string>
 
     <string name="account_setup_incoming_subscribed_folders_only_label">Només mostra carpetes subscrites</string>
     <string name="account_setup_auto_expand_folder">Autoexpandeix carpeta</string>

res/values-cs/strings.xml

@@ -186,7 +186,6 @@
     <string name="special_mailbox_name_spam">Nevyžádaná</string>
     <!-- Mailbox names displayed to user -->
 
-    <string name="special_mailbox_name_outbox_fmt"><xliff:g id="folder">%s</xliff:g> (K odeslání)</string>
     <string name="special_mailbox_name_drafts_fmt"><xliff:g id="folder">%s</xliff:g> (Koncepty)</string>
     <string name="special_mailbox_name_trash_fmt"><xliff:g id="folder">%s</xliff:g> (Koš)</string>
     <string name="special_mailbox_name_sent_fmt"><xliff:g id="folder">%s</xliff:g> (Odeslaná)</string>
@@ -440,7 +439,6 @@ Vítejte v nastavení pošty K-9 Mail.  K-9 je open source poštovní klient pro
     <string name="trash_folder_label">Název složky Koš</string>
     <string name="archive_folder_label">Název složky Archív</string>
     <string name="spam_folder_label">Název složky Nevyžádaná</string>
-    <string name="outbox_folder_label">Název složky K odeslání</string>
 
     <string name="account_setup_incoming_subscribed_folders_only_label">Zobrazit jen odebírané složky</string>
     <string name="account_setup_auto_expand_folder">Aut. rozbalená složka</string>

res/values-de/strings.xml

@@ -182,7 +182,6 @@
     <string name="special_mailbox_name_spam">Spam</string>
     <!-- Mailbox names displayed to user -->
 
-    <string name="special_mailbox_name_outbox_fmt"><xliff:g id="folder">%s</xliff:g> (Postausgang)</string>
     <string name="special_mailbox_name_drafts_fmt"><xliff:g id="folder">%s</xliff:g> (Entwürfe)</string>
     <string name="special_mailbox_name_trash_fmt"><xliff:g id="folder">%s</xliff:g> (Papierkorb)</string>
     <string name="special_mailbox_name_sent_fmt"><xliff:g id="folder">%s</xliff:g> (Gesendet)</string>
@@ -432,7 +431,6 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
     <string name="trash_folder_label">Ordner für gelöschte Objekte</string>
     <string name="archive_folder_label">Ordner für archivierte Objekte</string>
     <string name="spam_folder_label">Ordner für Spam</string>
-    <string name="outbox_folder_label">Ordner für ausgehende Objekte</string>
 
     <string name="account_setup_incoming_subscribed_folders_only_label">Nur ausgewählte Ordner anzeigen</string>
     <string name="account_setup_auto_expand_folder">Startordner</string>

res/values-es/strings.xml

@@ -180,7 +180,6 @@
     <string name="special_mailbox_name_spam">Spam</string>
     <!-- Mailbox names displayed to user -->
 
-    <string name="special_mailbox_name_outbox_fmt"><xliff:g id="folder">%s</xliff:g> (Salida)</string>
     <string name="special_mailbox_name_drafts_fmt"><xliff:g id="folder">%s</xliff:g> (Borradores)</string>
     <string name="special_mailbox_name_trash_fmt"><xliff:g id="folder">%s</xliff:g> (Papelera)</string>
     <string name="special_mailbox_name_sent_fmt"><xliff:g id="folder">%s</xliff:g> (Enviados)</string>
@@ -433,7 +432,6 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
     <string name="trash_folder_label">Carpeta Papelera</string>
     <string name="archive_folder_label">Carpeta Archivados</string>
     <string name="spam_folder_label">Carpeta SPAM</string>
-    <string name="outbox_folder_label">Carpeta Salida</string>
 
     <string name="account_setup_incoming_subscribed_folders_only_label">Ver sólo carpteas suscritas</string>
     <string name="account_setup_auto_expand_folder">Autoexpandir carpeta</string>

res/values-fi/strings.xml

@@ -181,7 +181,6 @@
     <string name="special_mailbox_name_spam">Roskaposti</string>
     <!-- Mailbox names displayed to user -->
 
-    <string name="special_mailbox_name_outbox_fmt"><xliff:g id="folder">%s</xliff:g> (Lähtevät)</string>
     <string name="special_mailbox_name_drafts_fmt"><xliff:g id="folder">%s</xliff:g> (Luonnokset)</string>
     <string name="special_mailbox_name_trash_fmt"><xliff:g id="folder">%s</xliff:g> (Roskakori)</string>
     <string name="special_mailbox_name_sent_fmt"><xliff:g id="folder">%s</xliff:g> (Lähetetyt)</string>
@@ -431,7 +430,6 @@ Tervetuloa K-9 Mail asennukseen.  K-9 on avoimen lähdekoodin sähköpostiasiak
     <string name="trash_folder_label">Roskakori-kansio</string>
     <string name="archive_folder_label">Arkisto-kansio</string>
     <string name="spam_folder_label">Roskaposti-kansio</string>
-    <string name="outbox_folder_label">Lähtevät-kansio</string>
 
     <string name="account_setup_incoming_subscribed_folders_only_label">Näytä vain tilatut kansiot</string>
     <string name="account_setup_auto_expand_folder">Aukaise kansio automaattisesti</string>

res/values-fr/strings.xml

@@ -173,7 +173,6 @@
   <string name="special_mailbox_name_archive">Archive</string>
   <string name="special_mailbox_name_spam">Spams</string>
 
-  <string name="special_mailbox_name_outbox_fmt"><xliff:g id="folder">%s</xliff:g> (Boîte d\'envoi)</string>
   <string name="special_mailbox_name_drafts_fmt"><xliff:g id="folder">%s</xliff:g> (Brouillons)</string>
   <string name="special_mailbox_name_trash_fmt"><xliff:g id="folder">%s</xliff:g> (Corbeille)</string>
   <string name="special_mailbox_name_sent_fmt"><xliff:g id="folder">%s</xliff:g> (Envoyés)</string>
@@ -394,7 +393,6 @@
   <string name="trash_folder_label">Nom du dossier de la corbeille</string>
   <string name="archive_folder_label">Nom du dossier des archives</string>
   <string name="spam_folder_label">Nom du dossier des spams</string>
-  <string name="outbox_folder_label">Nom du dossier de la boîte d\'envoi</string>
   <string name="account_setup_incoming_subscribed_folders_only_label">Afficher seulement les dossiers auxquels je suis abonné</string>
   <string name="account_setup_auto_expand_folder">Ouvrir automatiquement le dossier</string>
   <string name="account_setup_incoming_webdav_path_prefix_label">Chemin WebDAV (Exchange)</string>

res/values-gl/strings.xml

@@ -180,7 +180,6 @@
     <string name="special_mailbox_name_spam">Spam</string>
     <!-- Mailbox names displayed to user -->
 
-    <string name="special_mailbox_name_outbox_fmt"><xliff:g id="folder">%s</xliff:g> (Saída)</string>
     <string name="special_mailbox_name_drafts_fmt"><xliff:g id="folder">%s</xliff:g> (Borradores)</string>
     <string name="special_mailbox_name_trash_fmt"><xliff:g id="folder">%s</xliff:g> (Lixo)</string>
     <string name="special_mailbox_name_sent_fmt"><xliff:g id="folder">%s</xliff:g> (Enviados)</string>
@@ -433,7 +432,6 @@ Benvido á Configuración de K-9. K-9 é un cliente de correo OpenSource para An
     <string name="trash_folder_label">Carpeta Lixo</string>
     <string name="archive_folder_label">Carpeta Arquivados</string>
     <string name="spam_folder_label">Carpeta SPAM</string>
-    <string name="outbox_folder_label">Carpeta Saída</string>
 
     <string name="account_setup_incoming_subscribed_folders_only_label">Ver só carpetas	suscritas</string>
     <string name="account_setup_auto_expand_folder">Autoexpandir carpeta</string>

res/values-it/strings.xml

@@ -182,7 +182,6 @@
     <string name="special_mailbox_name_spam">Spam</string>
     <!-- Mailbox names displayed to user -->
 
-    <string name="special_mailbox_name_outbox_fmt"><xliff:g id="folder">%s</xliff:g> (Posta in uscita)</string>
     <string name="special_mailbox_name_drafts_fmt"><xliff:g id="folder">%s</xliff:g> (Bozze)</string>
     <string name="special_mailbox_name_trash_fmt"><xliff:g id="folder">%s</xliff:g> (Cestino)</string>
     <string name="special_mailbox_name_sent_fmt"><xliff:g id="folder">%s</xliff:g> (Posta inviata)</string>
@@ -435,7 +434,6 @@ Benvenuto nella configurazione della posta di K-9. K-9 è un client di posta ope
     <string name="trash_folder_label">Cartella Cestino</string>
     <string name="archive_folder_label">Cartella Archivio</string>
     <string name="spam_folder_label">Cartella Spam</string>
-    <string name="outbox_folder_label">Cartella Posta in uscita</string>
 
     <string name="account_setup_incoming_subscribed_folders_only_label">Mostra solo le cartelle sottoscritte</string>
     <string name="account_setup_auto_expand_folder">Auto-espandi cartella</string>

res/values-ja/strings.xml

@@ -180,7 +180,6 @@
     <string name="special_mailbox_name_spam">迷惑メール</string>
     <!-- Mailbox names displayed to user -->
 
-    <string name="special_mailbox_name_outbox_fmt"><xliff:g id="folder">%s</xliff:g> (送信トレイ)</string>
     <string name="special_mailbox_name_drafts_fmt"><xliff:g id="folder">%s</xliff:g> (下書き)</string>
     <string name="special_mailbox_name_trash_fmt"><xliff:g id="folder">%s</xliff:g> (ゴミ箱)</string>
     <string name="special_mailbox_name_sent_fmt"><xliff:g id="folder">%s</xliff:g> (送信済み)</string>
@@ -433,7 +432,6 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
     <string name="trash_folder_label">ゴミ箱フォルダ名</string>
     <string name="archive_folder_label">アーカイブフォルダ名</string>
     <string name="spam_folder_label">迷惑メールフォルダ名</string>
-    <string name="outbox_folder_label">送信トレイフォルダ名</string>
 
     <string name="account_setup_incoming_subscribed_folders_only_label">購読フォルダのみ表示</string>
     <string name="account_setup_auto_expand_folder">自動表示フォルダ</string>

res/values-nl/strings.xml

@@ -181,7 +181,6 @@
     <string name="special_mailbox_name_spam">Spam</string>
     <!-- Mailbox names displayed to user -->
 
-    <string name="special_mailbox_name_outbox_fmt"><xliff:g id="folder">%s</xliff:g> (Postvak uit)</string>
     <string name="special_mailbox_name_drafts_fmt"><xliff:g id="folder">%s</xliff:g> (Concepten)</string>
     <string name="special_mailbox_name_trash_fmt"><xliff:g id="folder">%s</xliff:g> (Prullenbak)</string>
     <string name="special_mailbox_name_sent_fmt"><xliff:g id="folder">%s</xliff:g> (Verzonden)</string>
@@ -434,7 +433,6 @@ Welkom bij K-9 Mail setup.  K-9 is een open source mail cliënt voor Android, ge
     <string name="trash_folder_label">Prullenbak map naam</string>
     <string name="archive_folder_label">Archief map naam</string>
     <string name="spam_folder_label">Spam map naam</string>
-    <string name="outbox_folder_label">Postvak uit map naam</string>
 
     <string name="account_setup_incoming_subscribed_folders_only_label">Laat alleen geabonneerde mappen zien</string>
     <string name="account_setup_auto_expand_folder">Auto-uitbreiden mappen</string>

res/values-pl/strings.xml

@@ -189,7 +189,6 @@
     <!-- NEW: <string name="special_mailbox_name_spam">Spam</string>-->
     <!-- Mailbox names displayed to user -->
 
-    <string name="special_mailbox_name_outbox_fmt"><xliff:g id="folder">%s</xliff:g> (Do wysłania)</string>
         <string name="special_mailbox_name_drafts_fmt"><xliff:g id="folder">%s</xliff:g> (Szkice)</string>
     <string name="special_mailbox_name_trash_fmt"><xliff:g id="folder">%s</xliff:g> (Śmietnik)</string>
     <string name="special_mailbox_name_sent_fmt"><xliff:g id="folder">%s</xliff:g> (Wysłane)</string>
@@ -444,7 +443,6 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
     <string name="trash_folder_label">Trash folder name</string>
     <!-- NEW: <string name="archive_folder_label">Archive folder</string>-->
     <!-- NEW: <string name="spam_folder_label">Spam folder</string>-->
-    <string name="outbox_folder_label">Outbox folder name</string>
 
     <string name="account_setup_incoming_subscribed_folders_only_label">Pokaż tylko subskrybowane foldery</string>
     <string name="account_setup_auto_expand_folder">Zawsze rozwijaj folder</string>

res/values-pt-rBR/strings.xml

@@ -178,7 +178,6 @@
     <string name="special_mailbox_name_spam">Spam</string>
     <!-- Mailbox names displayed to user -->
 
-    <string name="special_mailbox_name_outbox_fmt"><xliff:g id="folder">%s</xliff:g> (Saída)</string>
     <string name="special_mailbox_name_drafts_fmt"><xliff:g id="folder">%s</xliff:g> (Rascunhos)</string>
     <string name="special_mailbox_name_trash_fmt"><xliff:g id="folder">%s</xliff:g> (Lixo)</string>
     <string name="special_mailbox_name_sent_fmt"><xliff:g id="folder">%s</xliff:g> (Enviado)</string>
@@ -431,7 +430,6 @@ Bem-vindo à configuração do K-9 Mail. K-9 é um cliente de e-mail com código
     <string name="trash_folder_label">Pasta de lixo</string>
     <string name="archive_folder_label">Pasta de arquivo</string>
     <string name="spam_folder_label">Pasta de Spam</string>
-    <string name="outbox_folder_label">Pasta de saída</string>
 
     <string name="account_setup_incoming_subscribed_folders_only_label">Mostrar apenas pastas subscritas</string>
     <string name="account_setup_auto_expand_folder">Auto-expandir pastas</string>

res/values-ru/strings.xml

@@ -182,7 +182,6 @@
     <!-- NEW: <string name="special_mailbox_name_spam">Spam</string>-->
     <!-- Mailbox names displayed to user -->
 
-    <string name="special_mailbox_name_outbox_fmt"><xliff:g id="folder">%s</xliff:g> (Исходящие)</string>
     <string name="special_mailbox_name_drafts_fmt"><xliff:g id="folder">%s</xliff:g> (Черновики)</string>
     <string name="special_mailbox_name_trash_fmt"><xliff:g id="folder">%s</xliff:g> (Мусор)</string>
     <string name="special_mailbox_name_sent_fmt"><xliff:g id="folder">%s</xliff:g> (Отправленные)</string>
@@ -433,7 +432,6 @@
     <string name="trash_folder_label">Имя папки Мусора</string>
     <!-- NEW: <string name="archive_folder_label">Archive folder</string>-->
     <!-- NEW: <string name="spam_folder_label">Spam folder</string>-->
-    <string name="outbox_folder_label">Имя папки Исходящиx</string>
 
     <!-- NEW: <string name="account_setup_incoming_subscribed_folders_only_label">Show only subscribed folders</string>-->
     <string name="account_setup_auto_expand_folder">Автоматически открывать папку</string>

res/values-sv/strings.xml

@@ -182,7 +182,6 @@
     <string name="special_mailbox_name_spam">Skräppost</string>
     <!-- Mailbox names displayed to user -->
 
-    <string name="special_mailbox_name_outbox_fmt"><xliff:g id="folder">%s</xliff:g> (Utkorg)</string>
     <string name="special_mailbox_name_drafts_fmt"><xliff:g id="folder">%s</xliff:g> (Utkast)</string>
     <string name="special_mailbox_name_trash_fmt"><xliff:g id="folder">%s</xliff:g> (Papperskorg)</string>
     <string name="special_mailbox_name_sent_fmt"><xliff:g id="folder">%s</xliff:g> (Skickat)</string>
@@ -435,7 +434,6 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
     <string name="trash_folder_label">Namn på papperskorgen</string>
     <string name="archive_folder_label">Namn på arkivmapp</string>
     <string name="spam_folder_label">Namn på skräpmapp</string>
-    <string name="outbox_folder_label">Namn på utkorg</string>
 
     <string name="account_setup_incoming_subscribed_folders_only_label">Visa endast prenumererade mappar</string>
     <string name="account_setup_auto_expand_folder">Auto-expandera mapp</string>

res/values-zh-rCN/strings.xml

@@ -175,7 +175,6 @@
     <string name="special_mailbox_name_spam">垃圾邮件</string>
     <!-- Mailbox names displayed to user -->
 
-    <string name="special_mailbox_name_outbox_fmt"><xliff:g id="folder">%s</xliff:g>（发件箱）</string>
     <string name="special_mailbox_name_drafts_fmt"><xliff:g id="folder">%s</xliff:g>（草稿箱）</string>
     <string name="special_mailbox_name_trash_fmt"><xliff:g id="folder">%s</xliff:g>（垃圾箱）</string>
     <string name="special_mailbox_name_sent_fmt"><xliff:g id="folder">%s</xliff:g>（已发送）</string>
@@ -422,7 +421,6 @@
     <string name="trash_folder_label">垃圾箱名称</string>
     <string name="archive_folder_label">归档文件夹名称</string>
     <string name="spam_folder_label">垃圾邮件箱名称</string>
-    <string name="outbox_folder_label">已发送文件夹名称</string>
 
     <string name="account_setup_incoming_subscribed_folders_only_label">只显示订阅的文件夹</string>
     <string name="account_setup_auto_expand_folder">自动展开文件夹</string>

res/values/strings.xml

@@ -182,7 +182,6 @@
     <string name="special_mailbox_name_spam">Spam</string>
     <!-- Mailbox names displayed to user -->
 
-    <string name="special_mailbox_name_outbox_fmt"><xliff:g id="folder">%s</xliff:g> (Outbox)</string>
     <string name="special_mailbox_name_drafts_fmt"><xliff:g id="folder">%s</xliff:g> (Drafts)</string>
     <string name="special_mailbox_name_trash_fmt"><xliff:g id="folder">%s</xliff:g> (Trash)</string>
     <string name="special_mailbox_name_sent_fmt"><xliff:g id="folder">%s</xliff:g> (Sent)</string>
@@ -435,7 +434,6 @@ Welcome to K-9 Mail setup.  K-9 is an open source mail client for Android origin
     <string name="trash_folder_label">Trash folder</string>
     <string name="archive_folder_label">Archive folder</string>
     <string name="spam_folder_label">Spam folder</string>
-    <string name="outbox_folder_label">Outbox folder</string>
 
     <string name="account_setup_incoming_subscribed_folders_only_label">Show only subscribed folders</string>
     <string name="account_setup_auto_expand_folder">Auto-expand folder</string>

res/xml/account_settings_preferences.xml

@@ -300,17 +300,12 @@
             android:key="archive_folder"
             android:title="@string/archive_folder_label"
             android:dialogTitle="@string/archive_folder_label" />
+
         <ListPreference
             android:persistent="false"
             android:key="drafts_folder"
             android:title="@string/drafts_folder_label"
             android:dialogTitle="@string/drafts_folder_label" />
-        <ListPreference
-            android:persistent="false"
-            android:key="outbox_folder"
-            android:title="@string/outbox_folder_label"
-            android:dialogTitle="@string/outbox_folder_label" />
-
 
         <ListPreference
             android:persistent="false"

src/com/fsck/k9/Account.java

@@ -85,7 +85,6 @@ public class Account implements BaseAccount {
     private String mTrashFolderName;
     private String mArchiveFolderName;
     private String mSpamFolderName;
-    private String mOutboxFolderName;
     private String mAutoExpandFolderName;
     private FolderMode mFolderDisplayMode;
     private FolderMode mFolderSyncMode;
@@ -252,7 +251,6 @@ public class Account implements BaseAccount {
         mTrashFolderName = prefs.getString(mUuid  + ".trashFolderName", "Trash");
         mArchiveFolderName = prefs.getString(mUuid  + ".archiveFolderName", "Archive");
         mSpamFolderName = prefs.getString(mUuid  + ".spamFolderName", "Spam");
-        mOutboxFolderName = prefs.getString(mUuid  + ".outboxFolderName", "Outbox");
         mExpungePolicy = prefs.getString(mUuid  + ".expungePolicy", EXPUNGE_IMMEDIATELY);
         mSyncRemoteDeletions = prefs.getBoolean(mUuid  + ".syncRemoteDeletions", true);
 
@@ -396,7 +394,6 @@ public class Account implements BaseAccount {
         editor.remove(mUuid + ".trashFolderName");
         editor.remove(mUuid + ".archiveFolderName");
         editor.remove(mUuid + ".spamFolderName");
-        editor.remove(mUuid + ".outboxFolderName");
         editor.remove(mUuid + ".autoExpandFolderName");
         editor.remove(mUuid + ".accountNumber");
         editor.remove(mUuid + ".vibrate");
@@ -493,7 +490,6 @@ public class Account implements BaseAccount {
         editor.putString(mUuid + ".trashFolderName", mTrashFolderName);
         editor.putString(mUuid + ".archiveFolderName", mArchiveFolderName);
         editor.putString(mUuid + ".spamFolderName", mSpamFolderName);
-        editor.putString(mUuid + ".outboxFolderName", mOutboxFolderName);
         editor.putString(mUuid + ".autoExpandFolderName", mAutoExpandFolderName);
         editor.putInt(mUuid + ".accountNumber", mAccountNumber);
         editor.putString(mUuid + ".hideButtonsEnum", mScrollMessageViewButtons.name());
@@ -828,11 +824,7 @@ public class Account implements BaseAccount {
     }
 
     public synchronized String getOutboxFolderName() {
-        return mOutboxFolderName;
+        return K9.OUTBOX;
-    }
-
-    public synchronized void setOutboxFolderName(String outboxFolderName) {
-        mOutboxFolderName = outboxFolderName;
     }
 
     public synchronized String getAutoExpandFolderName() {

src/com/fsck/k9/K9.java

@@ -213,6 +213,11 @@ public class K9 extends Application {
      */
     public static final String INBOX = "INBOX";
 
+    /**
+     * This local folder is used to store messages to be sent.
+     */
+    public static final String OUTBOX = "OUTBOX";
+
     /**
      * For use when displaying that no folder is selected
      */

src/com/fsck/k9/activity/ActivityListener.java

@@ -12,6 +12,7 @@ import com.fsck.k9.controller.MessagingListener;
 import com.fsck.k9.service.MailService;
 
 public class ActivityListener extends MessagingListener {
+    private Account mAccount = null;
     private String mLoadingFolderName = null;
     private String mLoadingHeaderFolderName = null;
     private String mLoadingAccountDescription = null;
@@ -37,6 +38,9 @@ public class ActivityListener extends MessagingListener {
                 if (K9.INBOX.equalsIgnoreCase(displayName)) {
                     displayName = context.getString(R.string.special_mailbox_name_inbox);
                 }
+                else if ((mAccount != null) && mAccount.getOutboxFolderName().equals(displayName)) {
+                    displayName = context.getString(R.string.special_mailbox_name_outbox);
+                }
 
                 if (mLoadingHeaderFolderName != null) {
 
@@ -82,6 +86,7 @@ public class ActivityListener extends MessagingListener {
         int numNewMessages) {
         mLoadingAccountDescription = null;
         mLoadingFolderName = null;
+        mAccount = null;
         informUserOfStatus();
     }
 
@@ -89,6 +94,7 @@ public class ActivityListener extends MessagingListener {
     public void synchronizeMailboxStarted(Account account, String folder) {
         mLoadingAccountDescription = account.getDescription();
         mLoadingFolderName = folder;
+        mAccount = account;
         mFolderCompleted = 0;
         mFolderTotal = 0;
         informUserOfStatus();
@@ -131,6 +137,7 @@ public class ActivityListener extends MessagingListener {
                                          String message) {
         mLoadingAccountDescription = null;
         mLoadingFolderName = null;
+        mAccount = null;
         informUserOfStatus();
 
     }

src/com/fsck/k9/activity/ChooseFolder.java

@@ -301,7 +301,7 @@ public class ChooseFolder extends K9ListActivity {
                     if (K9.INBOX.equalsIgnoreCase(name)) {
                         mAdapter.add(getString(R.string.special_mailbox_name_inbox));
                         heldInbox = name;
-                    } else if (!K9.ERROR_FOLDER_NAME.equals(name)) {
+                    } else if (!K9.ERROR_FOLDER_NAME.equals(name) && !account.getOutboxFolderName().equals(name)) {
                         mAdapter.add(name);
                     }
 

src/com/fsck/k9/activity/FolderInfoHolder.java

@@ -104,7 +104,7 @@ public class FolderInfoHolder implements Comparable<FolderInfoHolder> {
         }
 
         if (this.name.equals(account.getOutboxFolderName())) {
-            this.displayName = String.format(context.getString(R.string.special_mailbox_name_outbox_fmt), this.name);
+            this.displayName = context.getString(R.string.special_mailbox_name_outbox);
         }
 
         if (this.name.equals(account.getDraftsFolderName())) {

src/com/fsck/k9/activity/MessageList.java

@@ -488,6 +488,8 @@ public class MessageList
 
                 if (K9.INBOX.equalsIgnoreCase(displayName)) {
                     displayName = getString(R.string.special_mailbox_name_inbox);
+                } else if (mAccount.getOutboxFolderName().equals(displayName)) {
+                    displayName = getString(R.string.special_mailbox_name_outbox);
                 }
 
                 String dispString = mAdapter.mListener.formatHeader(MessageList.this, getString(R.string.message_list_title, mAccount.getDescription(), displayName), mUnreadMessageCount, getTimeFormat());

src/com/fsck/k9/activity/setup/AccountSettings.java

@@ -11,6 +11,7 @@ import android.preference.*;
 import android.util.Log;
 import android.view.KeyEvent;
 
+import java.util.Iterator;
 import java.util.Map;
 import java.util.LinkedList;
 import java.util.List;
@@ -96,7 +97,6 @@ public class AccountSettings extends K9PreferenceActivity {
 
     private static final String PREFERENCE_ARCHIVE_FOLDER = "archive_folder";
     private static final String PREFERENCE_DRAFTS_FOLDER = "drafts_folder";
-    private static final String PREFERENCE_OUTBOX_FOLDER = "outbox_folder";
     private static final String PREFERENCE_SENT_FOLDER = "sent_folder";
     private static final String PREFERENCE_SPAM_FOLDER = "spam_folder";
     private static final String PREFERENCE_TRASH_FOLDER = "trash_folder";
@@ -157,7 +157,6 @@ public class AccountSettings extends K9PreferenceActivity {
 
     private ListPreference mArchiveFolder;
     private ListPreference mDraftsFolder;
-    private ListPreference mOutboxFolder;
     private ListPreference mSentFolder;
     private ListPreference mSpamFolder;
     private ListPreference mTrashFolder;
@@ -699,7 +698,6 @@ public class AccountSettings extends K9PreferenceActivity {
         mAccount.setAutoExpandFolderName(reverseTranslateFolder(mAutoExpandFolder.getValue()));
         mAccount.setArchiveFolderName(mArchiveFolder.getValue());
         mAccount.setDraftsFolderName(mDraftsFolder.getValue());
-        mAccount.setOutboxFolderName(mOutboxFolder.getValue());
         mAccount.setSentFolderName(mSentFolder.getValue());
         mAccount.setSpamFolderName(mSpamFolder.getValue());
         mAccount.setTrashFolderName(mTrashFolder.getValue());
@@ -852,18 +850,26 @@ public class AccountSettings extends K9PreferenceActivity {
             } catch (Exception e) {
                 /// this can't be checked in
             }
-            allFolderValues = new String[folders.size()+2];
+
-            allFolderLabels = new String[folders.size()+2];
+            // TODO: In the future the call above should be changed to only return remote folders.
+            // For now we just remove the Outbox folder if present.
+            Iterator<? extends Folder> iter = folders.iterator();
+            while (iter.hasNext())
+            {
+                Folder folder = iter.next();
+                if (mAccount.getOutboxFolderName().equals(folder.getName()))
+                {
+                    iter.remove();
+                }
+            }
+
+            allFolderValues = new String[folders.size()+1];
+            allFolderLabels = new String[folders.size()+1];
 
             allFolderValues[0] = K9.FOLDER_NONE;
             allFolderLabels[0] = K9.FOLDER_NONE;
 
-            // There's a non-zero chance that "outbox" won't actually exist, so we force it into the list
+            int i = 1;
-            allFolderValues[1] = mAccount.getOutboxFolderName();
-            allFolderLabels[1] = mAccount.getOutboxFolderName();
-
-
-            int i = 2;
             for (Folder folder : folders) {
                 allFolderLabels[i] = folder.getName();
                 allFolderValues[i] = folder.getName();
@@ -880,8 +886,6 @@ public class AccountSettings extends K9PreferenceActivity {
             mArchiveFolder.setEnabled(false);
             mDraftsFolder = (ListPreference)findPreference(PREFERENCE_DRAFTS_FOLDER);
             mDraftsFolder.setEnabled(false);
-            mOutboxFolder = (ListPreference)findPreference(PREFERENCE_OUTBOX_FOLDER);
-            mOutboxFolder.setEnabled(false);
             mSentFolder = (ListPreference)findPreference(PREFERENCE_SENT_FOLDER);
             mSentFolder.setEnabled(false);
             mSpamFolder = (ListPreference)findPreference(PREFERENCE_SPAM_FOLDER);
@@ -896,14 +900,12 @@ public class AccountSettings extends K9PreferenceActivity {
             initListPreference(mAutoExpandFolder, mAccount.getAutoExpandFolderName(), allFolderLabels, allFolderValues);
             initListPreference(mArchiveFolder, mAccount.getArchiveFolderName(), allFolderLabels, allFolderValues);
             initListPreference(mDraftsFolder, mAccount.getDraftsFolderName(), allFolderLabels, allFolderValues);
-            initListPreference(mOutboxFolder, mAccount.getOutboxFolderName(), allFolderLabels, allFolderValues);
             initListPreference(mSentFolder, mAccount.getSentFolderName(), allFolderLabels, allFolderValues);
             initListPreference(mSpamFolder, mAccount.getSpamFolderName(), allFolderLabels, allFolderValues);
             initListPreference(mTrashFolder, mAccount.getTrashFolderName(), allFolderLabels, allFolderValues);
             mAutoExpandFolder.setEnabled(true);
             mArchiveFolder.setEnabled(true);
             mDraftsFolder.setEnabled(true);
-            mOutboxFolder.setEnabled(true);
             mSentFolder.setEnabled(true);
             mSpamFolder.setEnabled(true);
             mTrashFolder.setEnabled(true);

src/com/fsck/k9/activity/setup/AccountSetupBasics.java

@@ -233,7 +233,6 @@ public class AccountSetupBasics extends K9Activity
             mAccount.setTrashFolderName(getString(R.string.special_mailbox_name_trash));
             mAccount.setArchiveFolderName(getString(R.string.special_mailbox_name_archive));
             mAccount.setSpamFolderName(getString(R.string.special_mailbox_name_spam));
-            mAccount.setOutboxFolderName(getString(R.string.special_mailbox_name_outbox));
             mAccount.setSentFolderName(getString(R.string.special_mailbox_name_sent));
             AccountSetupCheckSettings.actionCheckSettings(this, mAccount, true, true);
         } catch (UnsupportedEncodingException enc) {
@@ -313,7 +312,6 @@ public class AccountSetupBasics extends K9Activity
         }
         mAccount.setDraftsFolderName(getString(R.string.special_mailbox_name_drafts));
         mAccount.setTrashFolderName(getString(R.string.special_mailbox_name_trash));
-        mAccount.setOutboxFolderName(getString(R.string.special_mailbox_name_outbox));
         mAccount.setSentFolderName(getString(R.string.special_mailbox_name_sent));
 
         AccountSetupAccountType.actionSelectAccountType(this, mAccount, mDefaultView.isChecked());

src/com/fsck/k9/mail/store/ImapStore.java

@@ -386,6 +386,13 @@ public class ImapStore extends Store {
 
                 if (folder.equalsIgnoreCase(K9.INBOX)) {
                     continue;
+                } else if (folder.equalsIgnoreCase(K9.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
+                     * we simply ignore the folder on the server.
+                     */
+                    continue;
                 } else {
 
                     if (getCombinedPrefix().length() > 0) {