Remove the setting to hide the refile buttons

With the introduction of the action bar there is no longer a separate
button bar for refile actions. So it's no longer necessary to hide the
buttons to save screen space.

res/values-ca/strings.xml

@@ -501,9 +501,6 @@ http://k9mail.googlecode.com/
     <!-- NEW: <string name="account_settings_mark_message_as_read_on_view_label">Mark message as read when opening</string>-->
     <!-- NEW: <string name="account_settings_mark_message_as_read_on_view_summary">Mark a message as read when it is opened for viewing</string>-->
 
-    <string name="account_settings_enable_move_buttons_label">Habilita botons emplenat</string>
-    <string name="account_settings_enable_move_buttons_summary">Mostra els botons d’Arxiu, Mou, i Brossa.</string>
-
     <string name="account_settings_show_pictures_label">Sempre mostra imatges</string>
     <string name="account_settings_show_pictures_never">No</string>
     <string name="account_settings_show_pictures_only_from_contacts">Dels contactes</string>

res/values-cs/strings.xml

@@ -506,9 +506,6 @@ http://k9mail.googlecode.com/
     <!-- NEW: <string name="account_settings_mark_message_as_read_on_view_label">Mark message as read when opening</string>-->
     <!-- NEW: <string name="account_settings_mark_message_as_read_on_view_summary">Mark a message as read when it is opened for viewing</string>-->
 
-    <string name="account_settings_enable_move_buttons_label">Povolit přesměrovací tlačítka</string>
-    <string name="account_settings_enable_move_buttons_summary">Zobrazit tlačítka Archív, Přesunout a Nevyžádaná.</string>
-
     <string name="account_settings_show_pictures_label">Vždy zobrazovat obrázky</string>
     <string name="account_settings_show_pictures_never">Ne</string>
     <string name="account_settings_show_pictures_only_from_contacts">Jen od kontaktů</string>

res/values-da/strings.xml

@@ -501,9 +501,6 @@ http://k9mail.googlecode.com/
     <!-- NEW: <string name="account_settings_mark_message_as_read_on_view_label">Mark message as read when opening</string>-->
     <!-- NEW: <string name="account_settings_mark_message_as_read_on_view_summary">Mark a message as read when it is opened for viewing</string>-->
 
-    <string name="account_settings_enable_move_buttons_label">Aktiver Flyt knapper</string>
-    <string name="account_settings_enable_move_buttons_summary">Vis Arkiver, Flyt og Spam knapper.</string>
-
     <string name="account_settings_show_pictures_label">Vis altid billeder</string>
     <string name="account_settings_show_pictures_never">Aldrig</string>
     <string name="account_settings_show_pictures_only_from_contacts">Kun når afsender findes i Kontakter</string>

res/values-de/strings.xml

@@ -501,9 +501,6 @@ http://k9mail.googlecode.com/.
     <string name="account_settings_mark_message_as_read_on_view_label">Nachricht beim Öffnen als gelesen markieren</string>
     <string name="account_settings_mark_message_as_read_on_view_summary">Markiert eine Nachricht als gelesen, sobald sie zum Betrachten geöffnet wird.</string>
 
-    <string name="account_settings_enable_move_buttons_label">Spam-Leiste</string>
-    <string name="account_settings_enable_move_buttons_summary">Zeige Archivieren-, Verschieben- und Spam-Schaltfläche.</string>
-
     <string name="account_settings_show_pictures_label">Bilder automatisch anzeigen</string>
     <string name="account_settings_show_pictures_never">Niemals</string>
     <string name="account_settings_show_pictures_only_from_contacts">Nur von Kontakten</string>

res/values-el/strings.xml

@@ -497,9 +497,6 @@ http://k9mail.googlecode.com/
     <string name="account_settings_mark_message_as_read_on_view_label">Σημείωση ως αναγνωσμένου με την ανάγνωση</string>
     <string name="account_settings_mark_message_as_read_on_view_summary">Σημείωση ως αναγνωσμένου με την προβολή</string>
 
-    <string name="account_settings_enable_move_buttons_label">Ενεργοποίηση πλήκτρων αρχειοθέτησης</string>
-    <string name="account_settings_enable_move_buttons_summary">Προβολή πλήκτρων Αρχειοθέτηση, Μετακίνηση και Σκουπίδια.</string>
-
     <string name="account_settings_show_pictures_label">Προβολή εικόνων πάντα</string>
     <string name="account_settings_show_pictures_never">Όχι</string>
     <string name="account_settings_show_pictures_only_from_contacts">Από τις επαφές</string>

res/values-es/strings.xml

@@ -500,9 +500,6 @@ http://k9mail.googlecode.com/
     <string name="account_settings_mark_message_as_read_on_view_label">Marcar mensaje como leído tras abrirlo</string>
     <string name="account_settings_mark_message_as_read_on_view_summary">Marcar mensaje como leído cuando se abre para verlo</string>
 
-    <string name="account_settings_enable_move_buttons_label">Habilitar botones de copia</string>
-    <string name="account_settings_enable_move_buttons_summary">Mostrar botones de archivar, mover y SPAM</string>
-
     <string name="account_settings_show_pictures_label">Mostrar imágenes</string>
     <string name="account_settings_show_pictures_never">Nunca</string>
     <string name="account_settings_show_pictures_only_from_contacts">Sólo de mis contactos</string>

res/values-fi/strings.xml

@@ -504,9 +504,6 @@ http://k9mail.googlecode.com/
     <string name="account_settings_mark_message_as_read_on_view_label">Merkitse viesti luetuksi avattaessa</string>
     <string name="account_settings_mark_message_as_read_on_view_summary">Merkitse viesti luetuksi, kun se avataan katseltavaksi</string>
 
-    <string name="account_settings_enable_move_buttons_label">Ota käyttöön Siirrä-painikkeet</string>
-    <string name="account_settings_enable_move_buttons_summary">Näytä Arkistoi-, Siirrä- ja Roskaposti-painikkeet.</string>
-
     <string name="account_settings_show_pictures_label">Näytä kuvat automaattisesti</string>
     <string name="account_settings_show_pictures_never">Ei koskaan</string>
     <string name="account_settings_show_pictures_only_from_contacts">Vain yhteystiedoissa olevilta lähettäjiltä</string>

res/values-fr-rCA/strings.xml

@@ -35,7 +35,6 @@
     <string name="special_mailbox_name_spam">Pourriels</string>
     <string name="special_mailbox_name_spam_fmt"><xliff:g id="folder">%s</xliff:g> (Pourriels)</string>
     <string name="spam_folder_label">Nom du dossier des pourriels</string>
-    <string name="account_settings_enable_move_buttons_summary">Montrer les boutons Archiver, Déplacer ou Pourriel</string>
     <string name="account_setup_push_limit_label">Maximum de dossiers poussés à vérifier</string>
     <string name="error_contact_address_not_found">Aucune adresse courriel trouvée</string>
     <string name="global_settings_show_correspondent_names_summary">Afficher le nom des correspondants plutôt que leurs adresses courriel</string>

res/values-fr/strings.xml

@@ -524,9 +524,6 @@ de plus</string>
     <string name="account_settings_mark_message_as_read_on_view_label">Message lu à l\'ouverture</string>
     <string name="account_settings_mark_message_as_read_on_view_summary">Marquer le message comme lu à l\'ouverture</string>
 
-    <string name="account_settings_enable_move_buttons_label">Activer les boutons de déplacement</string>
-    <string name="account_settings_enable_move_buttons_summary">Afficher les boutons Archiver, Déplacer ou Spam</string>
-
     <string name="account_settings_show_pictures_label">Afficher automatiquement les images</string>
     <string name="account_settings_show_pictures_never">Jamais</string>
     <string name="account_settings_show_pictures_only_from_contacts">Contacts uniquement</string>

res/values-gl/strings.xml

@@ -500,9 +500,6 @@ http://k9mail.googlecode.com/
     <!-- NEW: <string name="account_settings_mark_message_as_read_on_view_label">Mark message as read when opening</string>-->
     <!-- NEW: <string name="account_settings_mark_message_as_read_on_view_summary">Mark a message as read when it is opened for viewing</string>-->
 
-    <string name="account_settings_enable_move_buttons_label">Habilitar botóns de copia</string>
-    <string name="account_settings_enable_move_buttons_summary">Amosar botóns de arquivar, mover e SPAM</string>
-
     <string name="account_settings_show_pictures_label">Amosar imaxes</string>
     <string name="account_settings_show_pictures_never">Nunca</string>
     <string name="account_settings_show_pictures_only_from_contacts">Só dos meuis contactos</string>

res/values-hu/strings.xml

@@ -500,9 +500,6 @@
     <string name="account_settings_mark_message_as_read_on_view_label">Üzenet megjelölése olvasottnak megnyitáskor</string>
     <string name="account_settings_mark_message_as_read_on_view_summary">Olvasottnak jelöli az üzenetet, ha megnézik</string>
 
-    <string name="account_settings_enable_move_buttons_label">Művelet gombok megjelenítése</string>
-    <string name="account_settings_enable_move_buttons_summary">Mutassa a Mozgatás, Archív és Levélszemét gombokat</string>
-
     <string name="account_settings_show_pictures_label">Képek megjelenítése</string>
     <string name="account_settings_show_pictures_never">Soha</string>
     <string name="account_settings_show_pictures_only_from_contacts">Csak az ismerősökét</string>

res/values-it/strings.xml

@@ -501,9 +501,6 @@ http://k9mail.googlecode.com/
     <string name="account_settings_mark_message_as_read_on_view_label">Segna messaggio come letto all\'apertura</string>
     <string name="account_settings_mark_message_as_read_on_view_summary">Segna messaggio come letto quando aperto</string>
 
-    <string name="account_settings_enable_move_buttons_label">Abilita pulsanti archiviazione</string>
-    <string name="account_settings_enable_move_buttons_summary">Mostra i pulsanti Archivia, Sposta e Spam.</string>
-
     <string name="account_settings_show_pictures_label">Mostra sempre le immagini</string>
     <string name="account_settings_show_pictures_never">No</string>
     <string name="account_settings_show_pictures_only_from_contacts">Dai contatti</string>

res/values-iw/strings.xml

@@ -502,9 +502,6 @@ http://k9mail.googlecode.com/
     <!-- NEW: <string name="account_settings_mark_message_as_read_on_view_label">Mark message as read when opening</string>-->
     <!-- NEW: <string name="account_settings_mark_message_as_read_on_view_summary">Mark a message as read when it is opened for viewing</string>-->
 
-    <string name="account_settings_enable_move_buttons_label">אפשר כפתורי תיוק מחדש</string>
-    <string name="account_settings_enable_move_buttons_summary">הצג כפתורי ארכיון, העבר ודואר זבל.</string>
-
     <string name="account_settings_show_pictures_label">תמיד הצג תמונות</string>
     <string name="account_settings_show_pictures_never">לא</string>
     <string name="account_settings_show_pictures_only_from_contacts">מאנשי הקשר</string>

res/values-ja/strings.xml

@@ -501,9 +501,6 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
     <string name="account_settings_mark_message_as_read_on_view_label">開くと同時に既読にする</string>
     <string name="account_settings_mark_message_as_read_on_view_summary">メッセージを参照したときに既読にする</string>
 
-    <string name="account_settings_enable_move_buttons_label">メール整理ボタンを有効にする</string>
-    <string name="account_settings_enable_move_buttons_summary">アーカイブ、移動、迷惑メールボタンを表示</string>
-
     <string name="account_settings_show_pictures_label">画像を自動で表示</string>
     <string name="account_settings_show_pictures_never">しない</string>
     <string name="account_settings_show_pictures_only_from_contacts">連絡先に登録しているユーザからのメールのみ</string>

res/values-ko/strings.xml

@@ -499,9 +499,6 @@ K-9 메일 설치를 환영합니다.  K-9은 표준 안드로이드 메일 클
     <!-- NEW: <string name="account_settings_mark_message_as_read_on_view_label">Mark message as read when opening</string>-->
     <!-- NEW: <string name="account_settings_mark_message_as_read_on_view_summary">Mark a message as read when it is opened for viewing</string>-->
 
-    <string name="account_settings_enable_move_buttons_label">재정리(refile) 버튼 활성화</string>
-    <string name="account_settings_enable_move_buttons_summary">보관, 이동, 스팸 버튼을 보이기</string>
-
     <string name="account_settings_show_pictures_label">항상 그림 보기</string>
     <string name="account_settings_show_pictures_never">아니오</string>
     <string name="account_settings_show_pictures_only_from_contacts">주소록에 등록된 경우</string>

res/values-nl/strings.xml

@@ -500,9 +500,6 @@ http://k9mail.googlecode.com/
     <!-- NEW: <string name="account_settings_mark_message_as_read_on_view_label">Mark message as read when opening</string>-->
     <!-- NEW: <string name="account_settings_mark_message_as_read_on_view_summary">Mark a message as read when it is opened for viewing</string>-->
 
-    <string name="account_settings_enable_move_buttons_label">Inschakelen verplaats knoppen</string>
-    <string name="account_settings_enable_move_buttons_summary">Laat de Archief, Verplaats, en Spam knoppen zien.</string>
-
     <string name="account_settings_show_pictures_label">Laat afbeeldingen automatisch zien</string>
     <string name="account_settings_show_pictures_never">Nooit</string>
     <string name="account_settings_show_pictures_only_from_contacts">Alleen van contacten</string>

res/values-pl/strings.xml

@@ -508,9 +508,6 @@ http://k9mail.googlecode.com/
     <string name="account_settings_mark_message_as_read_on_view_label">Oznacz jako przeczytane</string>
     <string name="account_settings_mark_message_as_read_on_view_summary">Oznacz wiadomość jako przeczytaną przy otwieraniu</string>
 
-    <string name="account_settings_enable_move_buttons_label">Użyj przycisków refile</string>
-    <string name="account_settings_enable_move_buttons_summary">Pokaż przyciski Archiwum, Przenieś, Spam.</string>
-
     <string name="account_settings_show_pictures_label">Zawsze pokazuj obrazki</string>
     <string name="account_settings_show_pictures_never">Nie</string>
     <string name="account_settings_show_pictures_only_from_contacts">Od kontaktów</string>

res/values-pt-rBR/strings.xml

@@ -497,9 +497,6 @@ http://k9mail.googlecode.com/
     <string name="account_settings_mark_message_as_read_on_view_label">Marcar mensagem como lida ao abrir</string>
     <string name="account_settings_mark_message_as_read_on_view_summary">Marcar a mensagem como lida ao abrir e visualizar</string>
 
-    <string name="account_settings_enable_move_buttons_label">Habilitar botão de ações</string>
-    <string name="account_settings_enable_move_buttons_summary">Mostrar botões de Arquivar, Mover e Span.</string>
-
     <string name="account_settings_show_pictures_label">Sempre mostrar imagens</string>
     <string name="account_settings_show_pictures_never">Não</string>
     <string name="account_settings_show_pictures_only_from_contacts">Dos contatos</string>

res/values-ru/strings.xml

@@ -495,9 +495,6 @@ http://k9mail.googlecode.com/
     <string name="account_settings_mark_message_as_read_on_view_label">Отметить сообщение как прочитанное при открытии</string>
     <string name="account_settings_mark_message_as_read_on_view_summary">Отметить сообщение как прочитанное при открытии для просмотра</string>
 
-    <string name="account_settings_enable_move_buttons_label">Разрешить кнопки переноса сообщений</string>
-    <string name="account_settings_enable_move_buttons_summary">Показывает кнопки: Архив, Переместить и Спам.</string>
-
     <string name="account_settings_show_pictures_label">Показывать изображения</string>
     <string name="account_settings_show_pictures_never">Никогда</string>
     <string name="account_settings_show_pictures_only_from_contacts">От контактов</string>

res/values-sv/strings.xml

@@ -501,9 +501,6 @@ http://k9mail.googlecode.com/
     <!-- NEW: <string name="account_settings_mark_message_as_read_on_view_label">Mark message as read when opening</string>-->
     <!-- NEW: <string name="account_settings_mark_message_as_read_on_view_summary">Mark a message as read when it is opened for viewing</string>-->
 
-    <string name="account_settings_enable_move_buttons_label">Aktivera flyttknappar</string>
-    <string name="account_settings_enable_move_buttons_summary">Visa knappar för att arkivera, flytta och spam-markera e-post.</string>
-
     <string name="account_settings_show_pictures_label">Visa bilder automatiskt</string>
     <string name="account_settings_show_pictures_never">Aldrig</string>
     <string name="account_settings_show_pictures_only_from_contacts">Bara från kontakter</string>

res/values-tr/strings.xml

@@ -501,9 +501,6 @@ http://k9mail.googlecode.com/ adresine gönderin.
     <string name="account_settings_mark_message_as_read_on_view_label">Mesaj açılırken okundu işaretle</string>
     <string name="account_settings_mark_message_as_read_on_view_summary">Mesaj okunmak üzere açıldığında okundu olarak işaretle</string>
 
-    <string name="account_settings_enable_move_buttons_label">İşaretleme düğmelerini etkinleştir</string>
-    <string name="account_settings_enable_move_buttons_summary">Arşiv, Taşıma ve Spam düğmelerini göster.</string>
-
     <string name="account_settings_show_pictures_label">Daima resimleri göster</string>
     <string name="account_settings_show_pictures_never">Hayır</string>
     <string name="account_settings_show_pictures_only_from_contacts">Kişilerden</string>

res/values-uk/strings.xml

@@ -501,9 +501,6 @@ http://k9mail.googlecode.com/
     <string name="account_settings_mark_message_as_read_on_view_label">Відмічати повідомлення як прочитане під час відкриття</string>
     <string name="account_settings_mark_message_as_read_on_view_summary">Відмічати повідомлення як прочитане під час відкриття для перегляду</string>
 
-    <string name="account_settings_enable_move_buttons_label">Дозволити кнопки переміщення повідомлень</string>
-    <string name="account_settings_enable_move_buttons_summary">Показувати кнопки: Архів, Перемістити, Спам.</string>
-
     <string name="account_settings_show_pictures_label">Завжди показувати зображення</string>
     <string name="account_settings_show_pictures_never">Ні</string>
     <string name="account_settings_show_pictures_only_from_contacts">Від контактів</string>

res/values-zh-rCN/strings.xml

@@ -494,9 +494,6 @@
     <string name="account_settings_mark_message_as_read_on_view_label">邮件打开时标记为已读</string>
     <string name="account_settings_mark_message_as_read_on_view_summary">当邮件打开时标记为已读</string>
 
-    <string name="account_settings_enable_move_buttons_label">启用整理按钮</string>
-    <string name="account_settings_enable_move_buttons_summary">显示归档、移动和标记为垃圾按钮</string>
-
     <string name="account_settings_show_pictures_label">显示图片</string>
     <string name="account_settings_show_pictures_never">从不</string>
     <string name="account_settings_show_pictures_only_from_contacts">来自您的联系人的邮件</string>

res/values-zh-rTW/strings.xml

@@ -494,9 +494,6 @@
     <string name="account_settings_mark_message_as_read_on_view_label">開啟自動標記已讀</string>
     <string name="account_settings_mark_message_as_read_on_view_summary">開啟檢視郵件內容時自動標記為已讀</string>
 
-    <string name="account_settings_enable_move_buttons_label">啟用整理按鈕</string>
-    <string name="account_settings_enable_move_buttons_summary">顯示歸檔、移動和標記為垃圾按鈕</string>
-
     <string name="account_settings_show_pictures_label">顯示圖片</string>
     <string name="account_settings_show_pictures_never">不要</string>
     <string name="account_settings_show_pictures_only_from_contacts">來自您的聯絡人的郵件</string>

res/values/strings.xml

@@ -503,9 +503,6 @@ http://k9mail.googlecode.com/
     <string name="account_settings_mark_message_as_read_on_view_label">Mark message as read when opening</string>
     <string name="account_settings_mark_message_as_read_on_view_summary">Mark a message as read when it is opened for viewing</string>
 
-    <string name="account_settings_enable_move_buttons_label">Enable refile buttons</string>
-    <string name="account_settings_enable_move_buttons_summary">Show the Archive, Move, and Spam buttons.</string>
-
     <string name="account_settings_show_pictures_label">Always show images</string>
     <string name="account_settings_show_pictures_never">No</string>
     <string name="account_settings_show_pictures_only_from_contacts">From contacts</string>

res/xml/account_settings_preferences.xml

@@ -76,13 +76,6 @@
                 android:entryValues="@array/account_settings_show_pictures_values"
                 android:dialogTitle="@string/account_settings_show_pictures_label" />
 
-            <CheckBoxPreference
-                android:persistent="false"
-                android:key="enable_move_buttons"
-                android:title="@string/account_settings_enable_move_buttons_label"
-                android:defaultValue="true"
-                android:summary="@string/account_settings_enable_move_buttons_summary" />
-
         </PreferenceCategory>
 
     </PreferenceScreen>

src/com/fsck/k9/Account.java

@@ -170,7 +170,6 @@ public class Account implements BaseAccount {
     private SortType mSortType;
     private HashMap<SortType, Boolean> mSortAscending = new HashMap<SortType, Boolean>();
     private ShowPictures mShowPictures;
-    private boolean mEnableMoveButtons;
     private boolean mIsSignatureBeforeQuotedText;
     private String mExpungePolicy = EXPUNGE_IMMEDIATELY;
     private int mMaxPushFolders;
@@ -279,7 +278,6 @@ public class Account implements BaseAccount {
         mSortType = DEFAULT_SORT_TYPE;
         mSortAscending.put(DEFAULT_SORT_TYPE, DEFAULT_SORT_ASCENDING);
         mShowPictures = ShowPictures.NEVER;
-        mEnableMoveButtons = false;
         mIsSignatureBeforeQuotedText = false;
         mExpungePolicy = EXPUNGE_IMMEDIATELY;
         mAutoExpandFolderName = INBOX;
@@ -425,8 +423,6 @@ public class Account implements BaseAccount {
             mShowPictures = ShowPictures.NEVER;
         }
 
-        mEnableMoveButtons = prefs.getBoolean(mUuid + ".enableMoveButtons", false);
-
         mNotificationSetting.setVibrate(prefs.getBoolean(mUuid + ".vibrate", false));
         mNotificationSetting.setVibratePattern(prefs.getInt(mUuid + ".vibratePattern", 0));
         mNotificationSetting.setVibrateTimes(prefs.getInt(mUuid + ".vibrateTimes", 5));
@@ -567,7 +563,6 @@ public class Account implements BaseAccount {
         editor.remove(mUuid + ".cryptoAutoSignature");
         editor.remove(mUuid + ".cryptoAutoEncrypt");
         editor.remove(mUuid + ".enabled");
-        editor.remove(mUuid + ".enableMoveButtons");
         editor.remove(mUuid + ".hideMoveButtonsEnum");
         editor.remove(mUuid + ".markMessageAsReadOnView");
         editor.remove(mUuid + ".alwaysShowCcBcc");
@@ -696,7 +691,6 @@ public class Account implements BaseAccount {
         editor.putString(mUuid + ".sortTypeEnum", mSortType.name());
         editor.putBoolean(mUuid + ".sortAscending", mSortAscending.get(mSortType));
         editor.putString(mUuid + ".showPicturesEnum", mShowPictures.name());
-        editor.putBoolean(mUuid + ".enableMoveButtons", mEnableMoveButtons);
         editor.putString(mUuid + ".folderDisplayMode", mFolderDisplayMode.name());
         editor.putString(mUuid + ".folderSyncMode", mFolderSyncMode.name());
         editor.putString(mUuid + ".folderPushMode", mFolderPushMode.name());
@@ -1654,14 +1648,6 @@ public class Account implements BaseAccount {
         mStripSignature = stripSignature;
     }
 
-    public boolean getEnableMoveButtons() {
-        return mEnableMoveButtons;
-    }
-
-    public void setEnableMoveButtons(boolean enableMoveButtons) {
-        mEnableMoveButtons = enableMoveButtons;
-    }
-
     public String getCryptoApp() {
         return mCryptoApp;
     }

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

@@ -73,7 +73,6 @@ public class AccountSettings extends K9PreferenceActivity {
     private static final String PREFERENCE_DISPLAY_COUNT = "account_display_count";
     private static final String PREFERENCE_DEFAULT = "account_default";
     private static final String PREFERENCE_SHOW_PICTURES = "show_pictures_enum";
-    private static final String PREFERENCE_ENABLE_MOVE_BUTTONS = "enable_move_buttons";
     private static final String PREFERENCE_NOTIFY = "account_notify";
     private static final String PREFERENCE_NOTIFY_SELF = "account_notify_self";
     private static final String PREFERENCE_NOTIFY_SYNC = "account_notify_sync";
@@ -144,7 +143,6 @@ public class AccountSettings extends K9PreferenceActivity {
     private CheckBoxPreference mAccountNotify;
     private CheckBoxPreference mAccountNotifySelf;
     private ListPreference mAccountShowPictures;
-    private CheckBoxPreference mAccountEnableMoveButtons;
     private CheckBoxPreference mAccountNotifySync;
     private CheckBoxPreference mAccountVibrate;
     private CheckBoxPreference mAccountLed;
@@ -453,10 +451,6 @@ public class AccountSettings extends K9PreferenceActivity {
         mAccountDefault.setChecked(
             mAccount.equals(Preferences.getPreferences(this).getDefaultAccount()));
 
-        mAccountEnableMoveButtons = (CheckBoxPreference) findPreference(PREFERENCE_ENABLE_MOVE_BUTTONS);
-        mAccountEnableMoveButtons.setEnabled(mIsMoveCapable);
-        mAccountEnableMoveButtons.setChecked(mAccount.getEnableMoveButtons());
-
         mAccountShowPictures = (ListPreference) findPreference(PREFERENCE_SHOW_PICTURES);
         mAccountShowPictures.setValue("" + mAccount.getShowPictures());
         mAccountShowPictures.setSummary(mAccountShowPictures.getEntry());
@@ -800,12 +794,6 @@ public class AccountSettings extends K9PreferenceActivity {
             mAccount.setRemoteSearchFullText(mRemoteSearchFullText.isChecked());
         }
 
-        if (!mIsMoveCapable) {
-            mAccount.setEnableMoveButtons(false);
-        } else {
-            mAccount.setEnableMoveButtons(mAccountEnableMoveButtons.isChecked());
-        }
-
         boolean needsRefresh = mAccount.setAutomaticCheckIntervalMinutes(Integer.parseInt(mCheckFrequency.getValue()));
         needsRefresh |= mAccount.setFolderSyncMode(Account.FolderMode.valueOf(mSyncMode.getValue()));
 

src/com/fsck/k9/fragment/MessageViewFragment.java

@@ -563,33 +563,26 @@ public class MessageViewFragment extends SherlockFragment implements OnClickList
 
         updateUnreadToggleTitle();
 
-        // comply with the setting
+        // check message, folder capability
-        if (!mAccount.getEnableMoveButtons()) {
+        if (!mController.isCopyCapable(mAccount)) {
+            menu.findItem(R.id.copy).setVisible(false);
+        }
+
+        if (mController.isMoveCapable(mAccount)) {
+            menu.findItem(R.id.move).setVisible(true);
+
+            menu.findItem(R.id.archive).setVisible(
+                !mMessageReference.folderName.equals(mAccount.getArchiveFolderName())
+                    && mAccount.hasArchiveFolder());
+
+            menu.findItem(R.id.spam).setVisible(
+                !mMessageReference.folderName.equals(mAccount.getSpamFolderName())
+                    && mAccount.hasSpamFolder());
+        } else {
+            menu.findItem(R.id.copy).setVisible(false);
             menu.findItem(R.id.move).setVisible(false);
             menu.findItem(R.id.archive).setVisible(false);
             menu.findItem(R.id.spam).setVisible(false);
-        } else {
-            // check message, folder capability
-            if (!mController.isCopyCapable(mAccount)) {
-                menu.findItem(R.id.copy).setVisible(false);
-            }
-
-            if (mController.isMoveCapable(mAccount)) {
-                menu.findItem(R.id.move).setVisible(true);
-
-                menu.findItem(R.id.archive).setVisible(
-                    !mMessageReference.folderName.equals(mAccount.getArchiveFolderName())
-                        && mAccount.hasArchiveFolder());
-
-                menu.findItem(R.id.spam).setVisible(
-                    !mMessageReference.folderName.equals(mAccount.getSpamFolderName())
-                        && mAccount.hasSpamFolder());
-            } else {
-                menu.findItem(R.id.copy).setVisible(false);
-                menu.findItem(R.id.move).setVisible(false);
-                menu.findItem(R.id.archive).setVisible(false);
-                menu.findItem(R.id.spam).setVisible(false);
-            }
         }
     }
 

src/com/fsck/k9/preferences/AccountSettings.java

@@ -71,9 +71,6 @@ public class AccountSettings {
         s.put("draftsFolderName", Settings.versions(
                 new V(1, new StringSetting("Drafts"))
             ));
-        s.put("enableMoveButtons", Settings.versions(
-                new V(1, new BooleanSetting(false))
-            ));
         s.put("expungePolicy", Settings.versions(
                 new V(1, new StringResourceSetting(Account.EXPUNGE_IMMEDIATELY,
                         R.array.account_setup_expunge_policy_values))

src/com/fsck/k9/preferences/Settings.java

@@ -35,7 +35,7 @@ public class Settings {
      *
      * @see SettingsExporter
      */
-    public static final int VERSION = 20;
+    public static final int VERSION = 21;
 
     public static Map<String, Object> validate(int version, Map<String,
             TreeMap<Integer, SettingsDescription>> settings,