diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index c6907fe01..063c3529e 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -453,7 +453,7 @@
   <string name="account_setup_failed_dlg_continue_action">Continuer</string>
 
     <string name="account_settings_push_advanced_title">Paramètres Push</string>
-  <string name="account_settings_title_fmt">Paramètres généraux</string>
+  <string name="account_settings_title_fmt">Paramètres du compte</string>
   <string name="account_settings_default">Compte par défaut</string>
   <string name="account_settings_default_label">Compte par défaut</string>
   <string name="account_settings_default_summary">Envoyer les messages de ce compte par défaut</string>
@@ -486,6 +486,7 @@
     <string name="account_settings_reply_after_quote_label">Réponse après la citation</string>
     <string name="account_settings_reply_after_quote_summary">Lors d\'une réponse, le texte d\'origine précèdera votre réponse</string>
 
+    <string name="account_settings_general_title">Paramètres généraux</string>
     <string name="account_settings_display_prefs_title">Affichage</string>
   <string name="account_settings_sync">Synchronication de dossiers</string>
   <string name="account_settings_folders">Dossiers</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7ddffe7d0..140a72e9b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -505,7 +505,7 @@ Welcome to K-9 Mail setup.  K-9 is an open source mail client for Android origin
     <string name="account_setup_failed_dlg_continue_action">Continue</string>
 
     <string name="account_settings_push_advanced_title">Advanced</string>
-    <string name="account_settings_title_fmt">General settings</string>
+    <string name="account_settings_title_fmt">Account settings</string>
     <string name="account_settings_default">Default account</string>
     <string name="account_settings_default_label">Default account</string>
     <string name="account_settings_default_summary">Send mail from this account by default</string>
@@ -539,7 +539,7 @@ Welcome to K-9 Mail setup.  K-9 is an open source mail client for Android origin
     <string name="account_settings_reply_after_quote_label">Reply after quoted text</string>
     <string name="account_settings_reply_after_quote_summary">When replying to messages, the original message will appear above your reply.</string>
 
-
+    <string name="account_settings_general_title">General settings</string>
     <string name="account_settings_display_prefs_title">Display</string>
     <string name="account_settings_sync">Fetching mail</string>
     <string name="account_settings_folders">Folders</string>
diff --git a/res/xml/account_settings_preferences.xml b/res/xml/account_settings_preferences.xml
index 0fa880548..2f030ccff 100644
--- a/res/xml/account_settings_preferences.xml
+++ b/res/xml/account_settings_preferences.xml
@@ -17,7 +17,7 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
     <PreferenceScreen
-        android:title="@string/account_settings_title_fmt"
+        android:title="@string/account_settings_general_title"
         android:key="account_settings">
 
         <EditTextPreference
diff --git a/src/com/fsck/k9/activity/setup/AccountSettings.java b/src/com/fsck/k9/activity/setup/AccountSettings.java
index 515ae2e35..f071688d7 100644
--- a/src/com/fsck/k9/activity/setup/AccountSettings.java
+++ b/src/com/fsck/k9/activity/setup/AccountSettings.java
@@ -154,9 +154,6 @@ public class AccountSettings extends K9PreferenceActivity
 
         addPreferencesFromResource(R.xml.account_settings_preferences);
 
-        Preference category = findPreference(PREFERENCE_TOP_CATERGORY);
-        category.setTitle(getString(R.string.account_settings_title_fmt));
-
         mAccountDescription = (EditTextPreference) findPreference(PREFERENCE_DESCRIPTION);
         mAccountDescription.setSummary(mAccount.getDescription());
         mAccountDescription.setText(mAccount.getDescription());