diff --git a/res/layout-land/message_view_scrolling_buttons.xml b/res/layout-land/message_view_scrolling_buttons.xml
deleted file mode 100644
index 036eee79e..000000000
--- a/res/layout-land/message_view_scrolling_buttons.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-
-            <LinearLayout
-                android:id="@+id/scrolling_move_buttons"
-                android:orientation="horizontal"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center_vertical">
-                <Button
-                    android:id="@+id/archive_scrolling"
-                    android:text="@string/message_view_archive_action"
-                    android:layout_height="wrap_content"
-                    android:layout_width="0dip"
-                    android:layout_weight="1" />
-
-                <Button
-                    android:id="@+id/move_scrolling"
-                    android:text="@string/message_view_move_action"
-                    android:layout_height="wrap_content"
-                    android:layout_width="0dip"
-                    android:layout_weight="1" />
-
-                <Button
-                    android:id="@+id/spam_scrolling"
-                    android:text="@string/message_view_spam_action"
-                    android:layout_height="wrap_content"
-                    android:layout_width="0dip"
-                    android:layout_weight="1" />
-            </LinearLayout>
-            <LinearLayout
-                android:id="@+id/scrolling_buttons"
-                android:orientation="horizontal"
-                android:layout_width="fill_parent"
-                android:layout_height="57dip"
-                android:background="@android:color/transparent"
-                android:gravity="center_vertical">
-                <Button
-                    android:id="@+id/previous_scrolling"
-                    android:text="@string/message_view_prev_action"
-                    android:contentDescription="@string/previous_action"
-                    android:textSize="35dip"
-                    android:layout_height="wrap_content"
-                    android:layout_width="0dip"
-                    android:padding="0dip"
-                    android:layout_weight="1" />
-                <Button
-                    android:id="@+id/reply_scrolling"
-                    android:text="@string/reply_action"
-                    android:layout_height="wrap_content"
-                    android:layout_width="0dip"
-                    android:layout_weight="1" />
-                <Button
-                    android:id="@+id/delete_scrolling"
-                    android:text="@string/delete_action"
-                    android:layout_height="wrap_content"
-                    android:layout_width="0dip"
-                    android:layout_weight="1" />
-                <Button
-                    android:id="@+id/forward_scrolling"
-                    android:text="@string/forward_action"
-                    android:layout_height="wrap_content"
-                    android:layout_width="0dip"
-                    android:layout_weight="1" />
-                 <Button
-                    android:id="@+id/next_scrolling"
-                    android:text="@string/message_view_next_action"
-                    android:contentDescription="@string/next_action"
-                    android:textSize="35dip"
-                    android:layout_height="wrap_content"
-                    android:layout_width="0dip"
-                    android:padding="0dip"
-                    android:layout_weight="1" />
-            </LinearLayout>
-</merge>
diff --git a/res/layout/message_view_scrolling_buttons.xml b/res/layout/message_view_scrolling_buttons.xml
deleted file mode 100644
index 426ee800c..000000000
--- a/res/layout/message_view_scrolling_buttons.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-    <LinearLayout
-            android:id="@+id/extra_buttons"
-            android:orientation="horizontal"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:paddingBottom="2dip"
-            android:gravity="center_vertical">
-        <Button
-                android:id="@+id/reply"
-                android:text="@string/reply_action"
-                android:layout_height="wrap_content"
-                android:layout_width="0dip"
-                android:layout_weight="1"/>
-        <Button
-                android:id="@+id/reply_all"
-                android:text="@string/reply_all_action"
-                android:layout_height="wrap_content"
-                android:layout_width="0dip"
-                android:layout_weight="1"/>
-        <Button
-                android:id="@+id/forward"
-                android:text="@string/forward_action"
-                android:layout_height="wrap_content"
-                android:layout_width="0dip"
-                android:layout_weight="1"/>
-    </LinearLayout>
-    <LinearLayout
-            android:id="@+id/scrolling_move_buttons"
-            android:orientation="horizontal"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:paddingBottom="2dip"
-            android:gravity="center_vertical">
-        <Button
-                android:id="@+id/archive_scrolling"
-                android:text="@string/message_view_archive_action"
-                android:layout_height="wrap_content"
-                android:layout_width="0dip"
-                android:layout_weight="1"/>
-
-        <Button
-                android:id="@+id/move_scrolling"
-                android:text="@string/message_view_move_action"
-                android:layout_height="wrap_content"
-                android:layout_width="0dip"
-                android:layout_weight="1"/>
-
-        <Button
-                android:id="@+id/spam_scrolling"
-                android:text="@string/message_view_spam_action"
-                android:layout_height="wrap_content"
-                android:layout_width="0dip"
-                android:layout_weight="1"/>
-    </LinearLayout>
-    <LinearLayout
-            android:id="@+id/scrolling_buttons"
-            android:orientation="horizontal"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center_vertical">
-        <Button
-                android:id="@+id/previous_scrolling"
-                android:text="@string/message_view_prev_action"
-                android:contentDescription="@string/previous_action"
-                android:textSize="35dip"
-                android:padding="0dip"
-                android:layout_height="wrap_content"
-                android:layout_width="0dip"
-                android:layout_weight="1"/>
-
-        <ImageButton
-                android:id="@+id/delete_scrolling"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_button_delete"
-                android:layout_width="0dip"
-                android:layout_weight="1"/>
-        <Button
-                android:id="@+id/next_scrolling"
-                android:padding="0dip"
-                android:text="@string/message_view_next_action"
-                android:textSize="35dip"
-                android:layout_height="wrap_content"
-                android:layout_width="0dip"
-                android:layout_weight="1"/>
-    </LinearLayout>
-</merge>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index df34a514a..0c6c20f79 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -542,14 +542,8 @@ Benvingut a la configuració del K-9.  El K-9 és un client de codi obert per An
     <string name="account_settings_notification_unread_count_label">Mostra correu no llegit</string>
     <string name="account_settings_notification_unread_count_summary">Mostra el nombre de missatges no llegits a la barra de notificació.</string>
 
-    <string name="account_settings_hide_buttons_label">Botons de desplaçament</string>
-    <string name="account_settings_hide_buttons_never">Mai</string>
-    <string name="account_settings_hide_buttons_keyboard_avail">Quan el teclat estigui disponible</string>
-    <string name="account_settings_hide_buttons_always">Sempre</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_hide_move_buttons_label">Navega botons emplenament</string>
 
     <string name="account_settings_show_pictures_label">Sempre mostra imatges</string>
     <string name="account_settings_show_pictures_never">No</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index c2058ab41..411fd90fe 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -549,14 +549,8 @@ Vítejte v nastavení pošty K-9 Mail.  K-9 je open source poštovní klient pro
     <!-- NEW: <string name="account_settings_notification_unread_count_label">Show unread count</string>-->
     <!-- NEW: <string name="account_settings_notification_unread_count_summary">Show the number of unread messages in the notification bar.</string>-->
 
-    <string name="account_settings_hide_buttons_label">Posunovat navigační tlačítka</string>
-    <string name="account_settings_hide_buttons_never">Nikdy</string>
-    <string name="account_settings_hide_buttons_keyboard_avail">Je-li dostupná klávesnice</string>
-    <string name="account_settings_hide_buttons_always">Vždy</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_hide_move_buttons_label">Posunovat přesměrovací tlačítka</string>
 
     <string name="account_settings_show_pictures_label">Vždy zobrazovat obrázky</string>
     <string name="account_settings_show_pictures_never">Ne</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 2848f173e..b02eafb63 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -545,14 +545,8 @@ Velkommen til K-9 Mail opsætning.  K-9 er en open source mail klient for Androi
     <string name="account_settings_notification_unread_count_label">Vis antal ulæste mails</string>
     <string name="account_settings_notification_unread_count_summary">Vis antallet af ulæste mails i statusbar.</string>
 
-    <string name="account_settings_hide_buttons_label">Scroll navigations knapper</string>
-    <string name="account_settings_hide_buttons_never">Aldrig</string>
-    <string name="account_settings_hide_buttons_keyboard_avail">Når tastatur er tilgængeligt</string>
-    <string name="account_settings_hide_buttons_always">Altid</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_hide_move_buttons_label">Scroll Flyt knapper</string>
 
     <string name="account_settings_show_pictures_label">Vis altid billeder</string>
     <string name="account_settings_show_pictures_never">Aldrig</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index c502c09b3..40246e921 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -543,14 +543,8 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
     <string name="account_settings_notification_unread_count_label">Anzahl ungelesener Nachrichten anzeigen</string>
     <string name="account_settings_notification_unread_count_summary">Zeigt die Anzahl der ungelesenen Nachrichten in der Statuszeile.</string>
 
-    <string name="account_settings_hide_buttons_label">Scrolle Navigationsleiste</string>
-    <string name="account_settings_hide_buttons_never">Leiste bleibt eingeblendet</string>
-    <string name="account_settings_hide_buttons_keyboard_avail">Nur wenn Tastatur aktiv</string>
-    <string name="account_settings_hide_buttons_always">Immer</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_hide_move_buttons_label">Scrolle Spam-Leiste</string>
 
     <string name="account_settings_show_pictures_label">Bilder automatisch anzeigen</string>
     <string name="account_settings_show_pictures_never">Niemals</string>
@@ -564,15 +558,15 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
 
     <string name="account_settings_reply_after_quote_label">Antwort unter Zitat</string>
     <string name="account_settings_reply_after_quote_summary">Die Antwort auf eine Nachricht unterhalb der Original-Nachricht platzieren.</string>
-	
-	<string name="account_settings_strip_signature_label">Unterschrift von zitierter Antwort entfernen</string>
-	<string name="account_settings_strip_signature_summary">Beim Antworten von Nachrichten wird die Unterschrift vom zitiertem Textabschnitt entfernt</string>
+
+    <string name="account_settings_strip_signature_label">Unterschrift von zitierter Antwort entfernen</string>
+    <string name="account_settings_strip_signature_summary">Beim Antworten von Nachrichten wird die Unterschrift vom zitiertem Textabschnitt entfernt</string>
 
     <string name="account_settings_message_format_label">Formatierung</string>
     <string name="account_settings_message_format_text">Einfacher Text (Bilder und Formatierungen werden entfernt)</string>
     <string name="account_settings_message_format_html">HTML (Bilder und Formatierungen bleiben erhalten)</string>
-	<string name="account_settings_message_format_auto">Automatisch (Einfacher Text, es sei denn bei Antwort auf HTML)</string>
-	
+    <string name="account_settings_message_format_auto">Automatisch (Einfacher Text, es sei denn bei Antwort auf HTML)</string>
+
     <string name="account_settings_message_read_receipt_label">Empfangsbestätigung</string>
     <string name="account_settings_message_read_receipt_summary">Immer eine Empfangsbestätigung anfordern</string>
 
@@ -595,11 +589,11 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
     <string name="account_settings_crypto_auto_signature_summary">Email Adresse des Kontos verwenden um Signaturschlüssel zu schätzen.</string>
 
     <string name="account_settings_crypto_auto_encrypt">Automatische verschlüsselung</string>
-	<string name="account_settings_crypto_auto_encrypt_summary">Verschlüsselung aktivieren falls für den Empfänger ein öffentlichen Schlüssel abgespeichert ist.</string>
-    
+    <string name="account_settings_crypto_auto_encrypt_summary">Verschlüsselung aktivieren falls für den Empfänger ein öffentlichen Schlüssel abgespeichert ist.</string>
+
     <string name="account_settings_mail_check_frequency_label">Häufigkeit der E-Mail-Abfrage</string>
     <string name="account_settings_second_class_check_frequency_label">Häufigkeit der Abfrage für Nebenordner</string>
-    
+
     <string name="account_settings_storage_title">Speicher</string>
 
     <string name="account_settings_color_label">Farbe des Kontos</string>
@@ -1022,10 +1016,10 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
 
     <string name="save_or_discard_draft_message_dlg_title">Entwurf speichern?</string>
     <string name="save_or_discard_draft_message_instructions_fmt">Entwurf speichern oder verwerfen?</string>
-    
+
     <string name="refuse_to_save_draft_marked_encrypted_dlg_title">Speichern des Entwurfs verweigern.</string>
     <string name="refuse_to_save_draft_marked_encrypted_instructions_fmt">Die Speicherung von als verschlüsselt markierten Entwürfen verweigern.</string>
-    
+
     <string name="continue_without_public_key_dlg_title">Ohne öffentlichen Schlüssel fortfahren?</string>
     <string name="continue_without_public_key_instructions_fmt">Einer oder mehrere Empfänger besitzen keinen abgespeicherten öffentlichen Schlüssel. Fortfahren?</string>
 
@@ -1053,7 +1047,7 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
     <string name="messagelist_sent_to_me_sigil">»</string>
     <string name="messagelist_sent_cc_me_sigil">›</string>
     <string name="error_unable_to_connect">Verbindungsfehler.</string>
-    
+
     <string name="import_export_action">Einstellungen Importieren &amp; Exportieren</string>
     <string name="settings_export_account">Kontoeinstellungen exportieren</string>
     <string name="settings_export_all">Einstellungen und Konten exportieren</string>
@@ -1104,5 +1098,5 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
     <string name="manage_accounts_move_up_action">Nach oben verschieben</string>
     <string name="manage_accounts_move_down_action">Nach unten verschieben</string>
     <string name="manage_accounts_moving_message">Konto verschieben...</string>
-    
+
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index e5e2cb121..8ff2f55c5 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -541,14 +541,8 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
     <string name="account_settings_notification_unread_count_label">Mostrar contador de correos sin leer</string>
     <string name="account_settings_notification_unread_count_summary">Mostrar el número de mensajes sin leer en la barra de notificaciones.</string>
 
-    <string name="account_settings_hide_buttons_label">Botones de desplazamiento</string>
-    <string name="account_settings_hide_buttons_never">Nunca</string>
-    <string name="account_settings_hide_buttons_keyboard_avail">Cuando el teclado está disponible</string>
-    <string name="account_settings_hide_buttons_always">Siempre</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_hide_move_buttons_label">Botones de copia</string>
 
     <string name="account_settings_show_pictures_label">Mostrar imágenes</string>
     <string name="account_settings_show_pictures_never">Nunca</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 534df7cd7..0ee649056 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -537,14 +537,8 @@ Tervetuloa K-9 Mail asennukseen.  K-9 on avoimen lähdekoodin sähköpostiasiak
     <string name="account_settings_notification_unread_count_label">Näytä lukemattomien viestien määrä</string>
     <string name="account_settings_notification_unread_count_summary">Näytä lukemattomien viestien määrä osoiterivillä.</string>
 
-    <string name="account_settings_hide_buttons_label">Selauksen painikkeet</string>
-    <string name="account_settings_hide_buttons_never">Ei koskaan</string>
-    <string name="account_settings_hide_buttons_keyboard_avail">Kun näppäimistö on käytettävissä</string>
-    <string name="account_settings_hide_buttons_always">Aina</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_hide_move_buttons_label">Vieritä Siirrä painikkeet</string>
 
     <string name="account_settings_show_pictures_label">Näytä kuvat automaattisesti</string>
     <string name="account_settings_show_pictures_never">Ei koskaan</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 3b3a86fde..e836d5c53 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -567,14 +567,8 @@ Bienvenue dans la configuration de K-9 Mail. K-9 Mail est un client de messageri
     <string name="account_settings_notification_unread_count_label">Afficher le nombre de messages non lus</string>
     <string name="account_settings_notification_unread_count_summary">Afficher le nombre de messages non lus dans la barre de notification</string>
 
-    <string name="account_settings_hide_buttons_label">Défiler les boutons de navigation</string>
-    <string name="account_settings_hide_buttons_never">Jamais</string>
-    <string name="account_settings_hide_buttons_keyboard_avail">Lorsque le clavier est disponible</string>
-    <string name="account_settings_hide_buttons_always">Toujours</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_hide_move_buttons_label">Défiler les boutons de déplacement</string>
 
     <string name="account_settings_show_pictures_label">Afficher automatiquement les images</string>
     <string name="account_settings_show_pictures_never">Jamais</string>
@@ -589,13 +583,13 @@ Bienvenue dans la configuration de K-9 Mail. K-9 Mail est un client de messageri
     <string name="account_settings_reply_after_quote_label">Réponse après la citation</string>
     <string name="account_settings_reply_after_quote_summary">Faire précéder la réponse par le texte d\'origine</string>
 
-	<string name="account_settings_strip_signature_label">Retirer signature dans réponse citée</string>
+    <string name="account_settings_strip_signature_label">Retirer signature dans réponse citée</string>
     <string name="account_settings_strip_signature_summary">Lorsque vous répondez à des messages, la signature du texte cité sera éffacée</string>
 
     <string name="account_settings_message_format_label">Format du message</string>
     <string name="account_settings_message_format_html">HTML (formattage et images conservés)</string>
     <string name="account_settings_message_format_text">Text brut (formattage et images omis)</string>
-	<string name="account_settings_message_format_auto">Automatique (Text brut à moins de répondre à un message HTML)</string>
+    <string name="account_settings_message_format_auto">Automatique (Text brut à moins de répondre à un message HTML)</string>
 
     <string name="account_settings_message_read_receipt_label">Accusé de réception</string>
     <string name="account_settings_message_read_receipt_summary">Toujours demander un accusé de réception</string>
@@ -617,9 +611,9 @@ Bienvenue dans la configuration de K-9 Mail. K-9 Mail est un client de messageri
     <string name="account_settings_crypto_app_not_available">Non disponible</string>
     <string name="account_settings_crypto_auto_signature">Signature automatique</string>
     <string name="account_settings_crypto_auto_signature_summary">Utiliser l\'adresse e-mail du compte pour déduire la clé de signature</string>
-	<string name="account_settings_crypto_auto_encrypt">Cryptation automatique</string>
-	<string name="account_settings_crypto_auto_encrypt_summary">Cryptation automatique si une clé publique correspond au destinataire.</string>
-	
+    <string name="account_settings_crypto_auto_encrypt">Cryptation automatique</string>
+    <string name="account_settings_crypto_auto_encrypt_summary">Cryptation automatique si une clé publique correspond au destinataire.</string>
+
     <string name="account_settings_mail_check_frequency_label">Fréquence de vérification du dossier</string>
     <string name="account_settings_second_class_check_frequency_label">Fréquence de vérification pour 2ème classe</string>
 
@@ -1045,12 +1039,12 @@ Bienvenue dans la configuration de K-9 Mail. K-9 Mail est un client de messageri
     <string name="save_or_discard_draft_message_dlg_title">Enregistrer le brouillon\u00A0?</string>
     <string name="save_or_discard_draft_message_instructions_fmt">Enregistrer ou abandonner ce message\u00A0?</string>
 
-	<string name="refuse_to_save_draft_marked_encrypted_dlg_title">Refuser d\'enregistrer des brouillons.</string>
-	<string name="refuse_to_save_draft_marked_encrypted_instructions_fmt">Refuser d\'enregistrer un message marqué comme crypté.</string>
-	
-	<string name="continue_without_public_key_dlg_title">Continuer sans clé publique?</string>
-	<string name="continue_without_public_key_instructions_fmt">Un ou plusieurs destinataires n\'ont pas de clé publique enregistrée. Continuer?</string>
-	
+    <string name="refuse_to_save_draft_marked_encrypted_dlg_title">Refuser d\'enregistrer des brouillons.</string>
+    <string name="refuse_to_save_draft_marked_encrypted_instructions_fmt">Refuser d\'enregistrer un message marqué comme crypté.</string>
+
+    <string name="continue_without_public_key_dlg_title">Continuer sans clé publique?</string>
+    <string name="continue_without_public_key_instructions_fmt">Un ou plusieurs destinataires n\'ont pas de clé publique enregistrée. Continuer?</string>
+
     <string name="charset_not_found">Ce message ne peut être affiché parce que le jeu de caractères «\u00A0<xliff:g id="charset">%s</xliff:g>\u00A0» n\'a pu être trouvé.</string>
 
     <string name="select_text_now">Sélectionnez le texte à copier</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index ff9a06f31..c1336f892 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -541,14 +541,8 @@ Benvido á Configuración de K-9. K-9 é un cliente de correo OpenSource para An
     <string name="account_settings_notification_unread_count_label">Amosar número de mensaxes non lidos</string>
     <string name="account_settings_notification_unread_count_summary">Amosar número de mensaxen non lidos na barra de notificacións.</string>
 
-    <string name="account_settings_hide_buttons_label">Botóns de desprazamento</string>
-    <string name="account_settings_hide_buttons_never">Nunca</string>
-    <string name="account_settings_hide_buttons_keyboard_avail">Cando o teclado esté dispoñible</string>
-    <string name="account_settings_hide_buttons_always">Sempre</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_hide_move_buttons_label">Botóns de copia</string>
 
     <string name="account_settings_show_pictures_label">Amosar imaxes</string>
     <string name="account_settings_show_pictures_never">Nunca</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 473aecfe5..f1abb0cfe 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -154,7 +154,7 @@
     <string name="special_mailbox_name_spam_fmt">%s</string>
     <string name="send_failure_subject">Néhány üzenetet nem sikerült elküldeni</string>
     <string name="send_failure_body_abbrev">Nézze meg a %s mappát a részletekért.</string>
-    <string name="send_failure_body_fmt">"A K-9 hibát észlelt üzenetküldés közben. A probléma miatt elképzelhető, hogy a levél nem érkezik meg, de az is lehet hogy igen. 
+    <string name="send_failure_body_fmt">"A K-9 hibát észlelt üzenetküldés közben. A probléma miatt elképzelhető, hogy a levél nem érkezik meg, de az is lehet hogy igen.
 
 Az ilyen hibás leveleket csillag jelzi a postázandó mappában. Ha eltávolítja a csillagot a K-9 megpróbálja újból elküldeni a levelet. Hosszan a Postázatlan mappára kattintva válassza az Üzenetek küldését.
 
@@ -162,26 +162,26 @@ Az ilyen hibás leveleket csillag jelzi a postázandó mappában. Ha eltávolít
     <string name="alert_header">K-9 riasztás</string>
     <string name="no_connection_alert">A szinkronizáció és a levélküldés felfüggesztve, hálozati kapcsolat hiánya miatt.</string>
     <string name="end_of_folder">Nincs több üzenet</string>
-    <string name="accounts_welcome">"Üdvözöljük a K-9 Mail beállításokban. A K-9 egy nyílt forráskódú levelezőprogram Androidra, a sima mail kliens alapjaira helyezve. 
- 
-K-9 továbbfejlesztett funkciói: 
- * Push mail using IMAP IDLE 
- * Jobb teljesítmény 
- * Message refiling 
- * E-mail aláírások 
- * Titkos másolat 
- * Mappa-előfizetések 
- * Minden mappa szinkronizálása 
- * Válasz cím beállítása 
- * Gyorsbillentyűk 
- * Jobb IMAP támogatás 
- * Mellékletek mentése a memóriakártyára 
- * Kuka ürítése 
- * Üzenetek válogatás 
+    <string name="accounts_welcome">"Üdvözöljük a K-9 Mail beállításokban. A K-9 egy nyílt forráskódú levelezőprogram Androidra, a sima mail kliens alapjaira helyezve.
+
+K-9 továbbfejlesztett funkciói:
+ * Push mail using IMAP IDLE
+ * Jobb teljesítmény
+ * Message refiling
+ * E-mail aláírások
+ * Titkos másolat
+ * Mappa-előfizetések
+ * Minden mappa szinkronizálása
+ * Válasz cím beállítása
+ * Gyorsbillentyűk
+ * Jobb IMAP támogatás
+ * Mellékletek mentése a memóriakártyára
+ * Kuka ürítése
+ * Üzenetek válogatás
  * ...és még sok más
 
-Magyarította: Deák Tamás (maya98) és RootRulez  
- 
+Magyarította: Deák Tamás (maya98) és RootRulez
+
 Vegye figyelembe, hogy a K-9 nem támogatja a legtöbb ingyenes hotmail fiókot és még sok más klienst. Történnek furcsaságok, ha Microsoft Exchange-el kommunikál.
  Hibajelentéseivel hozzájárul az újabb verziók tökéletesítéséhez, kérdéseit itt teheti fel http://k9mail.googlecode.com/"</string>
     <string name="debug_version_fmt">Verzió: %s</string>
@@ -218,7 +218,7 @@ Vegye figyelembe, hogy a K-9 nem támogatja a legtöbb ingyenes hotmail fiókot
     <string name="message_compose_quoted_text_label">Idézet</string>
     <string name="message_compose_error_no_recipients">Legalább egy címzetted adjon meg.</string>
     <string name="error_contact_address_not_found">E-mail cím nem található.</string>
-	<string name="message_compose_downloading_attachments_toast">Néhány melléklet nem lett letöltve. Levélküldés előtt automatikusan letöltődnek.</string>
+    <string name="message_compose_downloading_attachments_toast">Néhány melléklet nem lett letöltve. Levélküldés előtt automatikusan letöltődnek.</string>
     <string name="message_compose_attachments_skipped_toast">Néhány mellékletet nem lehet továbbítani, mert nem lettek letöltve.</string>
     <string name="message_view_from_format" formatted="false">Feladó: %s &lt;%s></string>
     <string name="message_to_label">Címzett:</string>
@@ -278,7 +278,7 @@ Vegye figyelembe, hogy a K-9 nem támogatja a legtöbb ingyenes hotmail fiókot
     <string name="global_settings_confirm_action_delete">Törlés (csak üzenetek nézet)</string>
     <string name="global_settings_confirm_action_spam">Levélszemét</string>
     <string name="global_settings_confirm_action_mark_all_as_read">Összes megjelölése olvasottként</string>
-	<string name="global_settings_confirm_action_send">Küldés</string>
+    <string name="global_settings_confirm_action_send">Küldés</string>
     <string name="global_settings_privacy_mode_title">Képernyőzár értesítések</string>
     <string name="global_settings_privacy_mode_summary">Lezárt képernyőnél ne mutassa a levelek tárgyát a állapotsoron</string>
     <string name="quiet_time">Csendes mód</string>
@@ -450,13 +450,8 @@ Levelek letöltése…"</string>
     <string name="account_settings_notification_opens_unread_summary">Értesítésre kattintva megnyitja az olvasatlan üzeneteket</string>
     <string name="account_settings_notification_unread_count_label">Olvasatlanok kijelzése</string>
     <string name="account_settings_notification_unread_count_summary">Olvasatlan levelek száma az állapotsoron.</string>
-    <string name="account_settings_hide_buttons_label">Görgetés iránygombokkal</string>
-    <string name="account_settings_hide_buttons_never">Soha</string>
-    <string name="account_settings_hide_buttons_keyboard_avail">Ha van billentyűzet</string>
-    <string name="account_settings_hide_buttons_always">Mindig</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_hide_move_buttons_label">Művelet gombok görgetése</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>
@@ -611,7 +606,7 @@ Levelek letöltése…"</string>
     <string name="account_settings_signature_use_label">Aláírás használata</string>
     <string name="account_settings_signature_label">Aláírás</string>
     <string name="account_settings_signature_summary">Az aláírás hozzáfűzése minden elküldött levélhez</string>
-    <string name="default_signature">"-- 
+    <string name="default_signature">"--
 Ezt a levelet mobiltelefonról küldtem, K-9 Mail-el. Elnézést a levél rövidségéért és az esetleges hibákért."</string>
     <string name="default_identity_description">Elsődleges személyazonosságom</string>
     <string name="choose_identity">Személyazonosság választása</string>
@@ -654,7 +649,7 @@ Ezt a levelet mobiltelefonról küldtem, K-9 Mail-el. Elnézést a levél rövid
     <string name="provider_note_hanmail">Ha POP3-at vagy IMAP-ot szeretne használni ehhez a szolgáltatóhoz, akkor engedélyeznie kell az IMAP vagy POP3 beállításokat a Hanmail(Daum) oldalán.</string>
     <string name="provider_note_paran">Ha POP3-at vagy IMAP-ot szeretne használni ehhez a szolgáltatóhoz, akkor engedélyeznie kell az IMAP vagy POP3 beállításokat a Paran oldalán.</string>
     <string name="provider_note_nate">Ha POP3-at vagy IMAP-ot szeretne használni ehhez a szolgáltatóhoz, akkor engedélyeznie kell az IMAP vagy POP3 beállításokat a Nate oldalán.</string>
-	<string name="account_setup_failed_dlg_invalid_certificate_title">Felismerhetetlen tanúsítvány</string>
+    <string name="account_setup_failed_dlg_invalid_certificate_title">Felismerhetetlen tanúsítvány</string>
     <string name="account_setup_failed_dlg_invalid_certificate_accept">Kulcs elfogadva</string>
     <string name="account_setup_failed_dlg_invalid_certificate_reject">Kulcs elutasítva</string>
     <string name="message_help_key">"Del (or D) - Delete
@@ -752,7 +747,7 @@ S - Select/deselect"</string>
     <string name="gestures_summary">Engedélyezi a kézmozdulakkal való vezérlést.</string>
     <string name="compact_layouts_title">Kompakt elrendezés</string>
     <string name="compact_layouts_summary">Adjust layouts to display more on each page</string>
-	<string name="volume_navigation_title">Hangerő gomb vezérlés</string>
+    <string name="volume_navigation_title">Hangerő gomb vezérlés</string>
     <string name="volume_navigation_summary">Léptetés az hangerő gombokkal</string>
     <string name="volume_navigation_message">Leveleknél</string>
     <string name="volume_navigation_list">Lista nézetek váltása</string>
@@ -766,7 +761,7 @@ S - Select/deselect"</string>
     <string name="count_search_summary">Kikcsapcsolva gyorsabb műkodés</string>
     <string name="hide_special_accounts_title">Különleges fiókok elrejtése</string>
     <string name="hide_special_accounts_summary">Egységesen elrejti a fiókok bejövő mappáit</string>
-	<string name="search_title" formatted="false">%s %s</string>
+    <string name="search_title" formatted="false">%s %s</string>
     <string name="flagged_modifier">- Csillagos</string>
     <string name="unread_modifier">- Olvasatlan</string>
     <string name="search_all_messages_title">Minden levél</string>
@@ -846,11 +841,11 @@ S - Select/deselect"</string>
     <string name="dialog_confirm_spam_confirm_button">Igen</string>
     <string name="dialog_confirm_spam_cancel_button">Nem</string>
     <string name="dialog_attachment_progress_title">Csatolmányok letöltése</string>
-	<string name="debug_logging_enabled">Hibakereső naplózás bekapcsolva</string>
+    <string name="debug_logging_enabled">Hibakereső naplózás bekapcsolva</string>
     <string name="messagelist_sent_to_me_sigil">»</string>
     <string name="messagelist_sent_cc_me_sigil">›</string>
     <string name="error_unable_to_connect">Nem lehet kapcsolódni.</string>
-	<string name="account_unavailable"> \"%s\" fiók nem elérhető ellenőríze a tárhelyet</string>
+    <string name="account_unavailable"> \"%s\" fiók nem elérhető ellenőríze a tárhelyet</string>
     <string name="settings_attachment_default_path">Csatolményok mentése ide:</string>
     <string name="attachment_save_title">Csatolményok mentése</string>
     <string name="attachment_save_desc">Nincs fájlkezelő. Hova szeretné mentni a csatolmányt?</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index c5d96f662..8d4716fb3 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -543,14 +543,8 @@ Benvenuto nella configurazione della posta di K-9. K-9 è un client di posta ope
     <string name="account_settings_notification_unread_count_label">Vedi numero messaggi non letti</string>
     <string name="account_settings_notification_unread_count_summary">Mostra il numero dei messaggi non letti nella barra di notifica.</string>
 
-    <string name="account_settings_hide_buttons_label">Scorri pulsanti navigazione</string>
-    <string name="account_settings_hide_buttons_never">Mai</string>
-    <string name="account_settings_hide_buttons_keyboard_avail">Quando la tastiera è disponibile</string>
-    <string name="account_settings_hide_buttons_always">Sempre</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_hide_move_buttons_label">Scorri pulsanti archiviazione</string>
 
     <string name="account_settings_show_pictures_label">Mostra sempre le immagini</string>
     <string name="account_settings_show_pictures_never">No</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index ff42ff2e4..55815636e 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -545,14 +545,8 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
     <string name="account_settings_notification_unread_count_label">未読件数の表示</string>
     <string name="account_settings_notification_unread_count_summary">通知バーに未読メッセージの件数を表示する</string>
 
-    <string name="account_settings_hide_buttons_label">ナビゲーションボタンのスクロール</string>
-    <string name="account_settings_hide_buttons_never">しない</string>
-    <string name="account_settings_hide_buttons_keyboard_avail">キーボード利用時</string>
-    <string name="account_settings_hide_buttons_always">常に</string>
-
     <string name="account_settings_enable_move_buttons_label">メール整理ボタンを有効にする</string>
     <string name="account_settings_enable_move_buttons_summary">アーカイブ、移動、迷惑メールボタンを表示</string>
-    <string name="account_settings_hide_move_buttons_label">メール整理ボタンをスクロール</string>
 
     <string name="account_settings_show_pictures_label">画像を自動で表示</string>
     <string name="account_settings_show_pictures_never">しない</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index bbc375844..8ec6c6e1f 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -542,14 +542,8 @@ K-9 메일 설치를 환영합니다.  K-9은 표준 안드로이드 메일 클
     <string name="account_settings_notification_unread_count_label">읽지 않은 메일 수 세기</string>
     <string name="account_settings_notification_unread_count_summary">읽지 않은 메시지의 수를 상태바에 보여줍니다.</string>
 
-    <string name="account_settings_hide_buttons_label">네비게이션 버튼을 스크롤</string>
-    <string name="account_settings_hide_buttons_never">하지않음</string>
-    <string name="account_settings_hide_buttons_keyboard_avail">키보드를 이용가능할 경우</string>
-    <string name="account_settings_hide_buttons_always">항상</string>
-
     <string name="account_settings_enable_move_buttons_label">재정리(refile) 버튼 활성화</string>
     <string name="account_settings_enable_move_buttons_summary">보관, 이동, 스팸 버튼을 보이기</string>
-    <string name="account_settings_hide_move_buttons_label">재정리(refile) 보튼을 스크롤</string>
 
     <string name="account_settings_show_pictures_label">항상 그림 보기</string>
     <string name="account_settings_show_pictures_never">아니오</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index d1ffcb412..0aa8f88c4 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -541,14 +541,8 @@ Welkom bij K-9 Mail setup.  K-9 is een open source mail cliënt voor Android, ge
     <string name="account_settings_notification_unread_count_label">Toon aantal ongelezen</string>
     <string name="account_settings_notification_unread_count_summary">Toon het aantal ongelezen berichten in de \'notification bar\'.</string>
 
-    <string name="account_settings_hide_buttons_label">Scroll navigatie knoppen</string>
-    <string name="account_settings_hide_buttons_never">Nooit</string>
-    <string name="account_settings_hide_buttons_keyboard_avail">Wanneer toetsenbord beschikbaar is</string>
-    <string name="account_settings_hide_buttons_always">Altijd</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_hide_move_buttons_label">Scroll verplaats knoppen</string>
 
     <string name="account_settings_show_pictures_label">Laat afbeeldingen automatisch zien</string>
     <string name="account_settings_show_pictures_never">Nooit</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 204fd5c57..654a08cc2 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -553,14 +553,8 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
     <string name="account_settings_notification_unread_count_label">Pokaż liczbę nieprzeczytanych</string>
     <string name="account_settings_notification_unread_count_summary">Pokaż liczbę nieprzeczytanych wiadomości w pasku powiadomień.</string>
 
-    <string name="account_settings_hide_buttons_label">Przyciski nawigacyjne</string>
-    <string name="account_settings_hide_buttons_never">Przyciski nie są nigdy przesuwalne</string>
-    <string name="account_settings_hide_buttons_keyboard_avail">Przesuwalne, gdy jest klawiatura</string>
-    <string name="account_settings_hide_buttons_always">Przyciski są zawsze przesuwalne</string>
-
     <string name="account_settings_enable_move_buttons_label">Użyj przycisków refile </string> <!-- FIXME -->
     <string name="account_settings_enable_move_buttons_summary">Pokaż przyciski Archiwum, Przenieś, Spam.</string>
-    <string name="account_settings_hide_move_buttons_label">Przewijaj przyciski refile </string> <!-- FIXME -->
 
     <string name="account_settings_show_pictures_label">Zawsze pokazuj obrazki</string>
     <string name="account_settings_show_pictures_never">Nie</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 7af2f917a..9983cac18 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -539,14 +539,8 @@ Bem-vindo à configuração do K-9 Mail. K-9 é um cliente de e-mail com código
     <string name="account_settings_notification_unread_count_label">Mostrar contagem de não lidas</string>
     <string name="account_settings_notification_unread_count_summary">Mostrar o número de mensagens não lidas na barra de notificação.</string>
 
-    <string name="account_settings_hide_buttons_label">Navegação com botões de scroll</string>
-    <string name="account_settings_hide_buttons_never">Nunca</string>
-    <string name="account_settings_hide_buttons_keyboard_avail">Quando teclado estiver disponível</string>
-    <string name="account_settings_hide_buttons_always">Sempre</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_hide_move_buttons_label">Scroll para botões de ação </string>
 
     <string name="account_settings_show_pictures_label">Sempre mostrar imagens</string>
     <string name="account_settings_show_pictures_never">Não</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index d6089d4bf..fb1452369 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -533,14 +533,8 @@
     <string name="account_settings_notification_unread_count_label">Показать количество непрочитанных</string>
     <string name="account_settings_notification_unread_count_summary">Показать количество непрочитанных в строке уведомлений.</string>
 
-    <string name="account_settings_hide_buttons_label">Прокрутка навигационных кнопок</string>
-    <string name="account_settings_hide_buttons_never">Никогда</string>
-    <string name="account_settings_hide_buttons_keyboard_avail">Когда присутствует клавиатура</string>
-    <string name="account_settings_hide_buttons_always">Всегда</string>
-
     <string name="account_settings_enable_move_buttons_label">Разрешить кнопки переноса сообщений</string>
     <string name="account_settings_enable_move_buttons_summary">Показывает кнопки: Архив, Переместить, Спам.</string>
-    <string name="account_settings_hide_move_buttons_label">Спрятать кнопки перемещения</string>
 
     <string name="account_settings_show_pictures_label">Показывать изображения</string>
     <string name="account_settings_show_pictures_never">Никогда</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index f33a11d6a..e31e80896 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -543,14 +543,8 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
     <string name="account_settings_notification_unread_count_label">Visa antal olästa</string>
     <string name="account_settings_notification_unread_count_summary">Visar antalet olästa brev i notifieringsytan.</string>
 
-    <string name="account_settings_hide_buttons_label">Scrolla navigationsknappar</string>
-    <string name="account_settings_hide_buttons_never">Aldrig</string>
-    <string name="account_settings_hide_buttons_keyboard_avail">När ett tangentbord är tillgängligt</string>
-    <string name="account_settings_hide_buttons_always">Alltid</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_hide_move_buttons_label">Scrolla flyttknappar</string>
 
     <string name="account_settings_show_pictures_label">Visa bilder automatiskt</string>
     <string name="account_settings_show_pictures_never">Aldrig</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index e18585d0c..f041fc740 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -516,14 +516,8 @@
     <string name="account_settings_notification_unread_count_label">Okunmamış sayısını göster</string>
     <string name="account_settings_notification_unread_count_summary">Bildirim çubuğunda okunmamış mesaj numarasını göster.</string>
 
-    <string name="account_settings_hide_buttons_label">Gezinme tuşlarını kaydırma</string>
-    <string name="account_settings_hide_buttons_never">Asla</string>
-    <string name="account_settings_hide_buttons_keyboard_avail">Klavye olduğu zaman</string>
-    <string name="account_settings_hide_buttons_always">Daima</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_hide_move_buttons_label">İşaretleme düğmelerini kaydır</string>
 
     <string name="account_settings_show_pictures_label">Daima imajları göster</string>
     <string name="account_settings_show_pictures_never">Hayır</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 96b44f504..0ba2a3617 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -530,14 +530,8 @@
     <!-- NEW: <string name="account_settings_notification_unread_count_label">Show unread count</string>-->
     <!-- NEW: <string name="account_settings_notification_unread_count_summary">Show the number of unread messages in the notification bar.</string>-->
 
-    <string name="account_settings_hide_buttons_label">滚动导航按钮</string>
-    <string name="account_settings_hide_buttons_never">从不</string>
-    <string name="account_settings_hide_buttons_keyboard_avail">使用键盘时</string>
-    <string name="account_settings_hide_buttons_always">总是</string>
-
     <string name="account_settings_enable_move_buttons_label">启用整理按钮</string>
     <string name="account_settings_enable_move_buttons_summary">显示归档、移动和标记为垃圾按钮</string>
-    <string name="account_settings_hide_move_buttons_label">滚动整理按钮</string>
 
     <string name="account_settings_show_pictures_label">显示图片</string>
     <string name="account_settings_show_pictures_never">从不</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index f0ca10ed2..ed4498dd5 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -539,14 +539,8 @@
     <string name="account_settings_notification_unread_count_label">顯示未讀郵件數</string>
     <string name="account_settings_notification_unread_count_summary">在通知欄上顯示未讀郵件數</string>
 
-    <string name="account_settings_hide_buttons_label">滾動導航按鈕</string>
-    <string name="account_settings_hide_buttons_never">從不</string>
-    <string name="account_settings_hide_buttons_keyboard_avail">使用鍵盤時</string>
-    <string name="account_settings_hide_buttons_always">總是</string>
-
     <string name="account_settings_enable_move_buttons_label">啟用整理按鈕</string>
     <string name="account_settings_enable_move_buttons_summary">顯示歸檔、移動和標記為垃圾按鈕</string>
-    <string name="account_settings_hide_move_buttons_label">滾動整理按鈕</string>
 
     <string name="account_settings_show_pictures_label">顯示圖片</string>
     <string name="account_settings_show_pictures_never">從不</string>
@@ -799,7 +793,7 @@
     <string name="provider_note_hanmail">要使用此提供者的IMAP或POP3，請先至Hanmail(Daum)郵箱設置頁設定允許使用IMAP或POP3。</string>
     <string name="provider_note_paran">要使用此提供者的IMAP或POP3，請先至Paran郵箱設置頁設定允許使用IMAP或POP3。</string>
     <string name="provider_note_nate">要使用此提供者的IMAP或POP3，請先至Nate郵箱設置頁設定允許使用IMAP或POP3。</string>
-    
+
     <string name="account_setup_failed_dlg_invalid_certificate_title">無法識別的證書訊息</string>
     <string name="account_setup_failed_dlg_invalid_certificate_accept">接收密鑰</string>
     <string name="account_setup_failed_dlg_invalid_certificate_reject">拒絕密鑰</string>
@@ -1060,5 +1054,5 @@
 
     <string name="manage_accounts_move_up_action">上移</string>
     <string name="manage_accounts_move_down_action">下移</string>
-    
+
 </resources>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index d33328ccb..8608cb367 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -149,30 +149,6 @@
         <item>NOT_SECOND_CLASS</item>
     </string-array>
 
-    <string-array name="account_settings_hide_buttons_entries">
-        <item>@string/account_settings_hide_buttons_never</item>
-        <item>@string/account_settings_hide_buttons_keyboard_avail</item>
-        <item>@string/account_settings_hide_buttons_always</item>
-    </string-array>
-
-    <string-array name="account_settings_hide_buttons_values">
-        <item>NEVER</item>
-        <item>KEYBOARD_AVAILABLE</item>
-        <item>ALWAYS</item>
-    </string-array>
-
-    <string-array name="account_settings_hide_move_buttons_entries">
-        <item>@string/account_settings_hide_buttons_never</item>
-        <item>@string/account_settings_hide_buttons_keyboard_avail</item>
-        <item>@string/account_settings_hide_buttons_always</item>
-    </string-array>
-
-    <string-array name="account_settings_hide_move_buttons_values">
-        <item>NEVER</item>
-        <item>KEYBOARD_AVAILABLE</item>
-        <item>ALWAYS</item>
-    </string-array>
-
     <string-array name="account_settings_show_pictures_entries">
         <item>@string/account_settings_show_pictures_never</item>
         <item>@string/account_settings_show_pictures_only_from_contacts</item>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8e8ad33a5..51ea0c50f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -550,14 +550,8 @@ Welcome to K-9 Mail setup.  K-9 is an open source mail client for Android origin
     <string name="account_settings_notification_unread_count_label">Show unread count</string>
     <string name="account_settings_notification_unread_count_summary">Show the number of unread messages in the notification bar.</string>
 
-    <string name="account_settings_hide_buttons_label">Scroll navigation buttons</string>
-    <string name="account_settings_hide_buttons_never">Never</string>
-    <string name="account_settings_hide_buttons_keyboard_avail">When keyboard is available</string>
-    <string name="account_settings_hide_buttons_always">Always</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_hide_move_buttons_label">Scroll refile buttons</string>
 
     <string name="account_settings_show_pictures_label">Always show images</string>
     <string name="account_settings_show_pictures_never">No</string>
diff --git a/res/xml/account_settings_preferences.xml b/res/xml/account_settings_preferences.xml
index a852549f5..9fa5a11a6 100644
--- a/res/xml/account_settings_preferences.xml
+++ b/res/xml/account_settings_preferences.xml
@@ -70,14 +70,6 @@
                 android:entryValues="@array/account_settings_show_pictures_values"
                 android:dialogTitle="@string/account_settings_show_pictures_label" />
 
-            <ListPreference
-                android:persistent="false"
-                android:key="hide_buttons_enum"
-                android:title="@string/account_settings_hide_buttons_label"
-                android:entries="@array/account_settings_hide_buttons_entries"
-                android:entryValues="@array/account_settings_hide_buttons_values"
-                android:dialogTitle="@string/account_settings_hide_buttons_label" />
-
             <CheckBoxPreference
                 android:persistent="false"
                 android:key="enable_move_buttons"
@@ -85,15 +77,6 @@
                 android:defaultValue="true"
                 android:summary="@string/account_settings_enable_move_buttons_summary" />
 
-            <ListPreference
-                android:persistent="false"
-                android:key="hide_move_buttons_enum"
-                android:dependency="enable_move_buttons"
-                android:title="@string/account_settings_hide_move_buttons_label"
-                android:entries="@array/account_settings_hide_move_buttons_entries"
-                android:entryValues="@array/account_settings_hide_move_buttons_values"
-                android:dialogTitle="@string/account_settings_hide_move_buttons_label" />
-
         </PreferenceCategory>
 
     </PreferenceScreen>
@@ -233,10 +216,10 @@
             android:entryValues="@array/account_settings_message_format_values" />
 
         <CheckBoxPreference
-	    android:persistent="false"
-	    android:key="message_read_receipt"
-	    android:title="@string/account_settings_message_read_receipt_label"
-	    android:summary="@string/account_settings_message_read_receipt_summary" />
+        android:persistent="false"
+        android:key="message_read_receipt"
+        android:title="@string/account_settings_message_read_receipt_label"
+        android:summary="@string/account_settings_message_read_receipt_summary" />
 
         <ListPreference
             android:persistent="false"
diff --git a/src/com/fsck/k9/Account.java b/src/com/fsck/k9/Account.java
index 3d49694b6..c04e89c06 100644
--- a/src/com/fsck/k9/Account.java
+++ b/src/com/fsck/k9/Account.java
@@ -121,8 +121,6 @@ public class Account implements BaseAccount {
     private boolean mSaveAllHeaders;
     private boolean mPushPollOnConnect;
     private boolean mNotifySync;
-    private ScrollButtons mScrollMessageViewButtons;
-    private ScrollButtons mScrollMessageViewMoveButtons;
     private ShowPictures mShowPictures;
     private boolean mEnableMoveButtons;
     private boolean mIsSignatureBeforeQuotedText;
@@ -180,10 +178,6 @@ public class Account implements BaseAccount {
         NONE, ALL, FIRST_CLASS, FIRST_AND_SECOND_CLASS, NOT_SECOND_CLASS
     }
 
-    public enum ScrollButtons {
-        NEVER, ALWAYS, KEYBOARD_AVAILABLE
-    }
-
     public enum ShowPictures {
         NEVER, ALWAYS, ONLY_FROM_CONTACTS
     }
@@ -216,8 +210,6 @@ public class Account implements BaseAccount {
         mFolderSyncMode = FolderMode.FIRST_CLASS;
         mFolderPushMode = FolderMode.FIRST_CLASS;
         mFolderTargetMode = FolderMode.NOT_SECOND_CLASS;
-        mScrollMessageViewButtons = ScrollButtons.NEVER;
-        mScrollMessageViewMoveButtons = ScrollButtons.NEVER;
         mShowPictures = ShowPictures.NEVER;
         mEnableMoveButtons = false;
         mIsSignatureBeforeQuotedText = false;
@@ -339,20 +331,6 @@ public class Account implements BaseAccount {
                                   (random.nextInt(0x70) * 0xffff) +
                                   0xff000000);
 
-        try {
-            mScrollMessageViewButtons = ScrollButtons.valueOf(prefs.getString(mUuid + ".hideButtonsEnum",
-                                        ScrollButtons.NEVER.name()));
-        } catch (Exception e) {
-            mScrollMessageViewButtons = ScrollButtons.NEVER;
-        }
-
-        try {
-            mScrollMessageViewMoveButtons = ScrollButtons.valueOf(prefs.getString(mUuid + ".hideMoveButtonsEnum",
-                                            ScrollButtons.NEVER.name()));
-        } catch (Exception e) {
-            mScrollMessageViewMoveButtons = ScrollButtons.NEVER;
-        }
-
         try {
             mShowPictures = ShowPictures.valueOf(prefs.getString(mUuid + ".showPicturesEnum",
                                                  ShowPictures.NEVER.name()));
@@ -617,8 +595,6 @@ public class Account implements BaseAccount {
         editor.putString(mUuid + ".spamFolderName", mSpamFolderName);
         editor.putString(mUuid + ".autoExpandFolderName", mAutoExpandFolderName);
         editor.putInt(mUuid + ".accountNumber", mAccountNumber);
-        editor.putString(mUuid + ".hideButtonsEnum", mScrollMessageViewButtons.name());
-        editor.putString(mUuid + ".hideMoveButtonsEnum", mScrollMessageViewMoveButtons.name());
         editor.putString(mUuid + ".showPicturesEnum", mShowPictures.name());
         editor.putBoolean(mUuid + ".enableMoveButtons", mEnableMoveButtons);
         editor.putString(mUuid + ".folderDisplayMode", mFolderDisplayMode.name());
@@ -1024,22 +1000,6 @@ public class Account implements BaseAccount {
         this.mNotifySync = showOngoing;
     }
 
-    public synchronized ScrollButtons getScrollMessageViewButtons() {
-        return mScrollMessageViewButtons;
-    }
-
-    public synchronized void setScrollMessageViewButtons(ScrollButtons scrollMessageViewButtons) {
-        mScrollMessageViewButtons = scrollMessageViewButtons;
-    }
-
-    public synchronized ScrollButtons getScrollMessageViewMoveButtons() {
-        return mScrollMessageViewMoveButtons;
-    }
-
-    public synchronized void setScrollMessageViewMoveButtons(ScrollButtons scrollMessageViewButtons) {
-        mScrollMessageViewMoveButtons = scrollMessageViewButtons;
-    }
-
     public synchronized ShowPictures getShowPictures() {
         return mShowPictures;
     }
diff --git a/src/com/fsck/k9/activity/MessageView.java b/src/com/fsck/k9/activity/MessageView.java
index 40da84093..fa3a303cd 100644
--- a/src/com/fsck/k9/activity/MessageView.java
+++ b/src/com/fsck/k9/activity/MessageView.java
@@ -4,7 +4,6 @@ import android.app.Dialog;
 import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.Intent;
-import android.content.res.Configuration;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
@@ -400,45 +399,21 @@ public class MessageView extends K9Activity implements OnClickListener {
         setOnClickListener(R.id.spam);
         // To show full header
         setOnClickListener(R.id.header_container);
-        setOnClickListener(R.id.reply_scrolling);
-//       setOnClickListener(R.id.reply_all_scrolling);
-        setOnClickListener(R.id.delete_scrolling);
-        setOnClickListener(R.id.forward_scrolling);
-        setOnClickListener(R.id.next_scrolling);
-        setOnClickListener(R.id.previous_scrolling);
-        setOnClickListener(R.id.archive_scrolling);
-        setOnClickListener(R.id.move_scrolling);
-        setOnClickListener(R.id.spam_scrolling);
         setOnClickListener(R.id.show_pictures);
         setOnClickListener(R.id.download_remainder);
 
 
-        // Perhaps the ScrollButtons should be global, instead of account-specific
-        Account.ScrollButtons scrollButtons = mAccount.getScrollMessageViewButtons();
-        if ((Account.ScrollButtons.ALWAYS == scrollButtons)
-                || (Account.ScrollButtons.KEYBOARD_AVAILABLE == scrollButtons &&
-                    (this.getResources().getConfiguration().hardKeyboardHidden == Configuration.HARDKEYBOARDHIDDEN_NO))) {
-            scrollButtons();
-        } else {  // never or the keyboard is open
-            staticButtons();
-        }
-        Account.ScrollButtons scrollMoveButtons = mAccount.getScrollMessageViewMoveButtons();
-        if ((Account.ScrollButtons.ALWAYS == scrollMoveButtons)
-                || (Account.ScrollButtons.KEYBOARD_AVAILABLE == scrollMoveButtons &&
-                    (this.getResources().getConfiguration().hardKeyboardHidden == Configuration.HARDKEYBOARDHIDDEN_NO))) {
-            scrollMoveButtons();
-        } else {
-            staticMoveButtons();
-        }
+        mNext = findViewById(R.id.next);
+        mPrevious = findViewById(R.id.previous);
+        mDelete = findViewById(R.id.delete);
+
+        mArchive = findViewById(R.id.archive);
+        mMove = findViewById(R.id.move);
+        mSpam = findViewById(R.id.spam);
+
         if (!mAccount.getEnableMoveButtons()) {
             View buttons = findViewById(R.id.move_buttons);
-            if (buttons != null) {
-                buttons.setVisibility(View.GONE);
-            }
-            buttons = findViewById(R.id.scrolling_move_buttons);
-            if (buttons != null) {
-                buttons.setVisibility(View.GONE);
-            }
+            buttons.setVisibility(View.GONE);
         }
     }
 
@@ -488,45 +463,6 @@ public class MessageView extends K9Activity implements OnClickListener {
             disableMoveButtons();
         }
     }
-    private void staticButtons() {
-        View buttons = findViewById(R.id.scrolling_buttons);
-        if (buttons != null) {
-            buttons.setVisibility(View.GONE);
-        }
-        mNext = findViewById(R.id.next);
-        mPrevious = findViewById(R.id.previous);
-        mDelete = findViewById(R.id.delete);
-    }
-
-    private void scrollButtons() {
-        View buttons = findViewById(R.id.bottom_buttons);
-        if (buttons != null) {
-            buttons.setVisibility(View.GONE);
-        }
-        mNext = findViewById(R.id.next_scrolling);
-        mPrevious = findViewById(R.id.previous_scrolling);
-        mDelete = findViewById(R.id.delete_scrolling);
-    }
-
-    private void staticMoveButtons() {
-        View buttons = findViewById(R.id.scrolling_move_buttons);
-        if (buttons != null) {
-            buttons.setVisibility(View.GONE);
-        }
-        mArchive = findViewById(R.id.archive);
-        mMove = findViewById(R.id.move);
-        mSpam = findViewById(R.id.spam);
-    }
-
-    private void scrollMoveButtons() {
-        View buttons = findViewById(R.id.move_buttons);
-        if (buttons != null) {
-            buttons.setVisibility(View.GONE);
-        }
-        mArchive = findViewById(R.id.archive_scrolling);
-        mMove = findViewById(R.id.move_scrolling);
-        mSpam = findViewById(R.id.spam_scrolling);
-    }
 
     private void disableButtons() {
         mMessageView.setLoadPictures(false);
@@ -850,38 +786,30 @@ public class MessageView extends K9Activity implements OnClickListener {
     public void onClick(View view) {
         switch (view.getId()) {
         case R.id.reply:
-        case R.id.reply_scrolling:
             onReply();
             break;
         case R.id.reply_all:
             onReplyAll();
             break;
         case R.id.delete:
-        case R.id.delete_scrolling:
             onDelete();
             break;
         case R.id.forward:
-        case R.id.forward_scrolling:
             onForward();
             break;
         case R.id.archive:
-        case R.id.archive_scrolling:
             onRefile(mAccount.getArchiveFolderName());
             break;
         case R.id.spam:
-        case R.id.spam_scrolling:
             onRefile(mAccount.getSpamFolderName());
             break;
         case R.id.move:
-        case R.id.move_scrolling:
             onMove();
             break;
         case R.id.next:
-        case R.id.next_scrolling:
             onNext();
             break;
         case R.id.previous:
-        case R.id.previous_scrolling:
             onPrevious();
             break;
         case R.id.download:
diff --git a/src/com/fsck/k9/activity/setup/AccountSettings.java b/src/com/fsck/k9/activity/setup/AccountSettings.java
index 17ef87327..a7fae42e5 100644
--- a/src/com/fsck/k9/activity/setup/AccountSettings.java
+++ b/src/com/fsck/k9/activity/setup/AccountSettings.java
@@ -18,7 +18,6 @@ import java.util.List;
 import com.fsck.k9.Account;
 import com.fsck.k9.Account.FolderMode;
 import com.fsck.k9.Account.QuoteStyle;
-import com.fsck.k9.Account.ScrollButtons;
 import com.fsck.k9.K9;
 import com.fsck.k9.NotificationSetting;
 import com.fsck.k9.Preferences;
@@ -54,8 +53,6 @@ public class AccountSettings extends K9PreferenceActivity {
     private static final String PREFERENCE_FREQUENCY = "account_check_frequency";
     private static final String PREFERENCE_DISPLAY_COUNT = "account_display_count";
     private static final String PREFERENCE_DEFAULT = "account_default";
-    private static final String PREFERENCE_HIDE_BUTTONS = "hide_buttons_enum";
-    private static final String PREFERENCE_HIDE_MOVE_BUTTONS = "hide_move_buttons_enum";
     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";
@@ -124,8 +121,6 @@ public class AccountSettings extends K9PreferenceActivity {
     private CheckBoxPreference mAccountDefault;
     private CheckBoxPreference mAccountNotify;
     private CheckBoxPreference mAccountNotifySelf;
-    private ListPreference mAccountScrollButtons;
-    private ListPreference mAccountScrollMoveButtons;
     private ListPreference mAccountShowPictures;
     private CheckBoxPreference mAccountEnableMoveButtons;
     private CheckBoxPreference mAccountNotifySync;
@@ -342,17 +337,17 @@ public class AccountSettings extends K9PreferenceActivity {
 
         mExpungePolicy = (ListPreference) findPreference(PREFERENCE_EXPUNGE_POLICY);
         if (mIsExpungeCapable) {
-	        mExpungePolicy.setValue(mAccount.getExpungePolicy());
-	        mExpungePolicy.setSummary(mExpungePolicy.getEntry());
-	        mExpungePolicy.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
-	            public boolean onPreferenceChange(Preference preference, Object newValue) {
-	                final String summary = newValue.toString();
-	                int index = mExpungePolicy.findIndexOfValue(summary);
-	                mExpungePolicy.setSummary(mExpungePolicy.getEntries()[index]);
-	                mExpungePolicy.setValue(summary);
-	                return false;
-	            }
-	        });
+            mExpungePolicy.setValue(mAccount.getExpungePolicy());
+            mExpungePolicy.setSummary(mExpungePolicy.getEntry());
+            mExpungePolicy.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
+                public boolean onPreferenceChange(Preference preference, Object newValue) {
+                    final String summary = newValue.toString();
+                    int index = mExpungePolicy.findIndexOfValue(summary);
+                    mExpungePolicy.setSummary(mExpungePolicy.getEntries()[index]);
+                    mExpungePolicy.setValue(summary);
+                    return false;
+                }
+            });
         } else {
             ((PreferenceScreen) findPreference(PREFERENCE_SCREEN_INCOMING)).removePreference(mExpungePolicy);
         }
@@ -390,25 +385,25 @@ public class AccountSettings extends K9PreferenceActivity {
             }
         });
 
-    
+
 
         mMessageAge = (ListPreference) findPreference(PREFERENCE_MESSAGE_AGE);
 
         if (!mAccount.isSearchByDateCapable()) {
             ((PreferenceScreen) findPreference(PREFERENCE_SCREEN_INCOMING)).removePreference(mMessageAge);
        } else {
-	        mMessageAge.setValue(String.valueOf(mAccount.getMaximumPolledMessageAge()));
-	        mMessageAge.setSummary(mMessageAge.getEntry());
-	        mMessageAge.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
-	            public boolean onPreferenceChange(Preference preference, Object newValue) {
-	                final String summary = newValue.toString();
-	                int index = mMessageAge.findIndexOfValue(summary);
-	                mMessageAge.setSummary(mMessageAge.getEntries()[index]);
-	                mMessageAge.setValue(summary);
-	                return false;
-	            }
-	        });
-	
+            mMessageAge.setValue(String.valueOf(mAccount.getMaximumPolledMessageAge()));
+            mMessageAge.setSummary(mMessageAge.getEntry());
+            mMessageAge.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
+                public boolean onPreferenceChange(Preference preference, Object newValue) {
+                    final String summary = newValue.toString();
+                    int index = mMessageAge.findIndexOfValue(summary);
+                    mMessageAge.setSummary(mMessageAge.getEntries()[index]);
+                    mMessageAge.setValue(summary);
+                    return false;
+                }
+            });
+
         }
 
         mMessageSize = (ListPreference) findPreference(PREFERENCE_MESSAGE_SIZE);
@@ -428,37 +423,10 @@ public class AccountSettings extends K9PreferenceActivity {
         mAccountDefault.setChecked(
             mAccount.equals(Preferences.getPreferences(this).getDefaultAccount()));
 
-        mAccountScrollButtons = (ListPreference) findPreference(PREFERENCE_HIDE_BUTTONS);
-        mAccountScrollButtons.setValue("" + mAccount.getScrollMessageViewButtons());
-        mAccountScrollButtons.setSummary(mAccountScrollButtons.getEntry());
-        mAccountScrollButtons.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
-            public boolean onPreferenceChange(Preference preference, Object newValue) {
-                final String summary = newValue.toString();
-                int index = mAccountScrollButtons.findIndexOfValue(summary);
-                mAccountScrollButtons.setSummary(mAccountScrollButtons.getEntries()[index]);
-                mAccountScrollButtons.setValue(summary);
-                return false;
-            }
-        });
-
         mAccountEnableMoveButtons = (CheckBoxPreference) findPreference(PREFERENCE_ENABLE_MOVE_BUTTONS);
         mAccountEnableMoveButtons.setEnabled(mIsMoveCapable);
         mAccountEnableMoveButtons.setChecked(mAccount.getEnableMoveButtons());
 
-        mAccountScrollMoveButtons = (ListPreference) findPreference(PREFERENCE_HIDE_MOVE_BUTTONS);
-        mAccountScrollMoveButtons.setEnabled(mIsMoveCapable);
-        mAccountScrollMoveButtons.setValue("" + mAccount.getScrollMessageViewMoveButtons());
-        mAccountScrollMoveButtons.setSummary(mAccountScrollMoveButtons.getEntry());
-        mAccountScrollMoveButtons.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
-            public boolean onPreferenceChange(Preference preference, Object newValue) {
-                final String summary = newValue.toString();
-                int index = mAccountScrollMoveButtons.findIndexOfValue(summary);
-                mAccountScrollMoveButtons.setSummary(mAccountScrollMoveButtons.getEntries()[index]);
-                mAccountScrollMoveButtons.setValue(summary);
-                return false;
-            }
-        });
-
         mAccountShowPictures = (ListPreference) findPreference(PREFERENCE_SHOW_PICTURES);
         mAccountShowPictures.setValue("" + mAccount.getShowPictures());
         mAccountShowPictures.setSummary(mAccountShowPictures.getEntry());
@@ -528,18 +496,18 @@ public class AccountSettings extends K9PreferenceActivity {
                     return false;
                 }
             });
-	        mPushMode = (ListPreference) findPreference(PREFERENCE_PUSH_MODE);
-	        mPushMode.setValue(mAccount.getFolderPushMode().name());
-	        mPushMode.setSummary(mPushMode.getEntry());
-	        mPushMode.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
-	            public boolean onPreferenceChange(Preference preference, Object newValue) {
-	                final String summary = newValue.toString();
-	                int index = mPushMode.findIndexOfValue(summary);
-	                mPushMode.setSummary(mPushMode.getEntries()[index]);
-	                mPushMode.setValue(summary);
-	                return false;
-	            }
-	        });
+            mPushMode = (ListPreference) findPreference(PREFERENCE_PUSH_MODE);
+            mPushMode.setValue(mAccount.getFolderPushMode().name());
+            mPushMode.setSummary(mPushMode.getEntry());
+            mPushMode.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
+                public boolean onPreferenceChange(Preference preference, Object newValue) {
+                    final String summary = newValue.toString();
+                    int index = mPushMode.findIndexOfValue(summary);
+                    mPushMode.setSummary(mPushMode.getEntries()[index]);
+                    mPushMode.setValue(summary);
+                    return false;
+                }
+            });
         } else {
             PreferenceScreen incomingPrefs = (PreferenceScreen) findPreference(PREFERENCE_SCREEN_INCOMING);
             incomingPrefs.removePreference( (PreferenceScreen) findPreference(PREFERENCE_SCREEN_PUSH_ADVANCED));
@@ -760,10 +728,8 @@ public class AccountSettings extends K9PreferenceActivity {
 
         if (!mIsMoveCapable) {
             mAccount.setEnableMoveButtons(false);
-            mAccount.setScrollMessageViewMoveButtons(ScrollButtons.NEVER);
         } else {
             mAccount.setEnableMoveButtons(mAccountEnableMoveButtons.isChecked());
-            mAccount.setScrollMessageViewMoveButtons(Account.ScrollButtons.valueOf(mAccountScrollMoveButtons.getValue()));
         }
 
         boolean needsRefresh = mAccount.setAutomaticCheckIntervalMinutes(Integer.parseInt(mCheckFrequency.getValue()));
@@ -782,24 +748,23 @@ public class AccountSettings extends K9PreferenceActivity {
             }
         }
 
-        mAccount.setScrollMessageViewButtons(Account.ScrollButtons.valueOf(mAccountScrollButtons.getValue()));
         mAccount.setShowPictures(Account.ShowPictures.valueOf(mAccountShowPictures.getValue()));
-       
-	    if (mIsPushCapable) {
-	        boolean needsPushRestart = mAccount.setFolderPushMode(Account.FolderMode.valueOf(mPushMode.getValue()));
-	        if (mAccount.getFolderPushMode() != FolderMode.NONE) {
-	            needsPushRestart |= displayModeChanged;
-	            needsPushRestart |= mIncomingChanged;
-	        }
-	
-	        if (needsRefresh && needsPushRestart) {
-	            MailService.actionReset(this, null);
-	        } else if (needsRefresh) {
-	            MailService.actionReschedulePoll(this, null);
-	        } else if (needsPushRestart) {
-	            MailService.actionRestartPushers(this, null);
-	        }
-	    }
+
+        if (mIsPushCapable) {
+            boolean needsPushRestart = mAccount.setFolderPushMode(Account.FolderMode.valueOf(mPushMode.getValue()));
+            if (mAccount.getFolderPushMode() != FolderMode.NONE) {
+                needsPushRestart |= displayModeChanged;
+                needsPushRestart |= mIncomingChanged;
+            }
+
+            if (needsRefresh && needsPushRestart) {
+                MailService.actionReset(this, null);
+            } else if (needsRefresh) {
+                MailService.actionReschedulePoll(this, null);
+            } else if (needsPushRestart) {
+                MailService.actionRestartPushers(this, null);
+            }
+        }
         // TODO: refresh folder list here
         mAccount.save(Preferences.getPreferences(this));
     }
diff --git a/src/com/fsck/k9/preferences/AccountSettings.java b/src/com/fsck/k9/preferences/AccountSettings.java
index 8beeb7fa3..fdc311820 100644
--- a/src/com/fsck/k9/preferences/AccountSettings.java
+++ b/src/com/fsck/k9/preferences/AccountSettings.java
@@ -12,7 +12,6 @@ import com.fsck.k9.Account;
 import com.fsck.k9.K9;
 import com.fsck.k9.R;
 import com.fsck.k9.Account.FolderMode;
-import com.fsck.k9.Account.ScrollButtons;
 import com.fsck.k9.crypto.Apg;
 import com.fsck.k9.mail.store.StorageManager;
 import com.fsck.k9.preferences.Settings.*;
@@ -82,12 +81,6 @@ public class AccountSettings {
         s.put("goToUnreadMessageSearch", Settings.versions(
                 new V(1, new BooleanSetting(false))
             ));
-        s.put("hideButtonsEnum", Settings.versions(
-                new V(1, new EnumSetting(ScrollButtons.class, ScrollButtons.NEVER))
-            ));
-        s.put("hideMoveButtonsEnum", Settings.versions(
-                new V(1, new EnumSetting(ScrollButtons.class, ScrollButtons.NEVER))
-            ));
         s.put("idleRefreshMinutes", Settings.versions(
                 new V(1, new IntegerResourceSetting(24, R.array.idle_refresh_period_values))
             ));
diff --git a/src/com/fsck/k9/preferences/Settings.java b/src/com/fsck/k9/preferences/Settings.java
index 1dd47f40e..3b2bbb979 100644
--- a/src/com/fsck/k9/preferences/Settings.java
+++ b/src/com/fsck/k9/preferences/Settings.java
@@ -35,7 +35,7 @@ public class Settings {
      *
      * @see SettingsExporter
      */
-    public static final int VERSION = 5;
+    public static final int VERSION = 6;
 
     public static Map<String, Object> validate(int version, Map<String,
             TreeMap<Integer, SettingsDescription>> settings,