diff --git a/res/xml/account_settings_preferences.xml b/res/xml/account_settings_preferences.xml
index e0519ce0b..0fa880548 100644
--- a/res/xml/account_settings_preferences.xml
+++ b/res/xml/account_settings_preferences.xml
@@ -154,7 +154,7 @@
             android:key="incoming"
             android:title="@string/account_settings_incoming_label"
             android:summary="@string/account_settings_incoming_summary" />
-        <PreferenceScreen
+        <PreferenceScreen 
             android:key="push_advanced"
             android:title="@string/account_settings_push_advanced_title">
         <CheckBoxPreference
diff --git a/src/com/fsck/k9/activity/K9PreferenceActivity.java b/src/com/fsck/k9/activity/K9PreferenceActivity.java
index 0fc6119c4..bbe3ec7cd 100644
--- a/src/com/fsck/k9/activity/K9PreferenceActivity.java
+++ b/src/com/fsck/k9/activity/K9PreferenceActivity.java
@@ -53,7 +53,7 @@ public class K9PreferenceActivity extends PreferenceActivity
      *         entry from entries is selected.
      */
     protected void initListPreference(final ListPreference prefView, final String value,
-            final CharSequence[] entries, final CharSequence[] entryValues)
+                                      final CharSequence[] entries, final CharSequence[] entryValues)
     {
         prefView.setEntries(entries);
         prefView.setEntryValues(entryValues);
diff --git a/src/com/fsck/k9/activity/setup/AccountSettings.java b/src/com/fsck/k9/activity/setup/AccountSettings.java
index 6979ccbb7..1e20609f5 100644
--- a/src/com/fsck/k9/activity/setup/AccountSettings.java
+++ b/src/com/fsck/k9/activity/setup/AccountSettings.java
@@ -141,6 +141,8 @@ public class AccountSettings extends K9PreferenceActivity
         String accountUuid = getIntent().getStringExtra(EXTRA_ACCOUNT);
         mAccount = Preferences.getPreferences(this).getAccount(accountUuid);
 
+
+
         boolean isPushCapable = false;
         boolean isExpungeCapable = false;
         try
@@ -621,6 +623,9 @@ public class AccountSettings extends K9PreferenceActivity
             }
         });
 
+
+
+
         mCryptoApp = (ListPreference) findPreference(PREFERENCE_CRYPTO_APP);
         CharSequence cryptoAppEntries[] = mCryptoApp.getEntries();
         if (!new Apg().isAvailable(this))
diff --git a/src/com/fsck/k9/activity/setup/FontSizeSettings.java b/src/com/fsck/k9/activity/setup/FontSizeSettings.java
index 96fb3475e..607ea06c2 100644
--- a/src/com/fsck/k9/activity/setup/FontSizeSettings.java
+++ b/src/com/fsck/k9/activity/setup/FontSizeSettings.java
@@ -75,53 +75,53 @@ public class FontSizeSettings extends K9PreferenceActivity
         addPreferencesFromResource(R.xml.font_preferences);
 
         mAccountName = setupListPreference(
-                PREFERENCE_ACCOUNT_NAME_FONT,
-                Integer.toString(fontSizes.getAccountName()));
+                           PREFERENCE_ACCOUNT_NAME_FONT,
+                           Integer.toString(fontSizes.getAccountName()));
         mAccountDescription = setupListPreference(
-                PREFERENCE_ACCOUNT_DESCRIPTION_FONT,
-                Integer.toString(fontSizes.getAccountDescription()));
+                                  PREFERENCE_ACCOUNT_DESCRIPTION_FONT,
+                                  Integer.toString(fontSizes.getAccountDescription()));
 
         mFolderName = setupListPreference(
-                PREFERENCE_FOLDER_NAME_FONT,
-                Integer.toString(fontSizes.getFolderName()));
+                          PREFERENCE_FOLDER_NAME_FONT,
+                          Integer.toString(fontSizes.getFolderName()));
         mFolderStatus = setupListPreference(
-                PREFERENCE_FOLDER_STATUS_FONT,
-                Integer.toString(fontSizes.getFolderStatus()));
+                            PREFERENCE_FOLDER_STATUS_FONT,
+                            Integer.toString(fontSizes.getFolderStatus()));
 
         mMessageListSubject = setupListPreference(
-                PREFERENCE_MESSAGE_LIST_SUBJECT_FONT,
-                Integer.toString(fontSizes.getMessageListSubject()));
+                                  PREFERENCE_MESSAGE_LIST_SUBJECT_FONT,
+                                  Integer.toString(fontSizes.getMessageListSubject()));
         mMessageListSender = setupListPreference(
-                PREFERENCE_MESSAGE_LIST_SENDER_FONT,
-                Integer.toString(fontSizes.getMessageListSender()));
+                                 PREFERENCE_MESSAGE_LIST_SENDER_FONT,
+                                 Integer.toString(fontSizes.getMessageListSender()));
         mMessageListDate = setupListPreference(
-                PREFERENCE_MESSAGE_LIST_DATE_FONT,
-                Integer.toString(fontSizes.getMessageListDate()));
+                               PREFERENCE_MESSAGE_LIST_DATE_FONT,
+                               Integer.toString(fontSizes.getMessageListDate()));
 
         mMessageViewSender = setupListPreference(
-                PREFERENCE_MESSAGE_VIEW_SENDER_FONT,
-                Integer.toString(fontSizes.getMessageViewSender()));
+                                 PREFERENCE_MESSAGE_VIEW_SENDER_FONT,
+                                 Integer.toString(fontSizes.getMessageViewSender()));
         mMessageViewTo = setupListPreference(
-                PREFERENCE_MESSAGE_VIEW_TO_FONT,
-                Integer.toString(fontSizes.getMessageViewTo()));
+                             PREFERENCE_MESSAGE_VIEW_TO_FONT,
+                             Integer.toString(fontSizes.getMessageViewTo()));
         mMessageViewCC = setupListPreference(
-                PREFERENCE_MESSAGE_VIEW_CC_FONT,
-                Integer.toString(fontSizes.getMessageViewCC()));
+                             PREFERENCE_MESSAGE_VIEW_CC_FONT,
+                             Integer.toString(fontSizes.getMessageViewCC()));
         mMessageViewAdditionalHeaders = setupListPreference(
-                PREFERENCE_MESSAGE_VIEW_ADDITIONAL_HEADERS_FONT,
-                Integer.toString(fontSizes.getMessageViewAdditionalHeaders()));
+                                            PREFERENCE_MESSAGE_VIEW_ADDITIONAL_HEADERS_FONT,
+                                            Integer.toString(fontSizes.getMessageViewAdditionalHeaders()));
         mMessageViewSubject = setupListPreference(
-                PREFERENCE_MESSAGE_VIEW_SUBJECT_FONT,
-                Integer.toString(fontSizes.getMessageViewSubject()));
+                                  PREFERENCE_MESSAGE_VIEW_SUBJECT_FONT,
+                                  Integer.toString(fontSizes.getMessageViewSubject()));
         mMessageViewTime = setupListPreference(
-                PREFERENCE_MESSAGE_VIEW_TIME_FONT,
-                Integer.toString(fontSizes.getMessageViewTime()));
+                               PREFERENCE_MESSAGE_VIEW_TIME_FONT,
+                               Integer.toString(fontSizes.getMessageViewTime()));
         mMessageViewDate = setupListPreference(
-                PREFERENCE_MESSAGE_VIEW_DATE_FONT,
-                Integer.toString(fontSizes.getMessageViewDate()));
+                               PREFERENCE_MESSAGE_VIEW_DATE_FONT,
+                               Integer.toString(fontSizes.getMessageViewDate()));
         mMessageViewContent = setupListPreference(
-                PREFERENCE_MESSAGE_VIEW_CONTENT_FONT,
-                Integer.toString(fontSizes.getMessageViewContentAsInt()));
+                                  PREFERENCE_MESSAGE_VIEW_CONTENT_FONT,
+                                  Integer.toString(fontSizes.getMessageViewContentAsInt()));
     }
 
     /**
diff --git a/src/com/fsck/k9/activity/setup/Prefs.java b/src/com/fsck/k9/activity/setup/Prefs.java
index f54deec17..5e059dbcf 100644
--- a/src/com/fsck/k9/activity/setup/Prefs.java
+++ b/src/com/fsck/k9/activity/setup/Prefs.java
@@ -114,8 +114,8 @@ public class Prefs extends K9PreferenceActivity
             }
         }
         initListPreference(mLanguage, K9.getK9Language(),
-                entryVector.toArray(EMPTY_CHAR_SEQUENCE_ARRAY),
-                entryValueVector.toArray(EMPTY_CHAR_SEQUENCE_ARRAY));
+                           entryVector.toArray(EMPTY_CHAR_SEQUENCE_ARRAY),
+                           entryValueVector.toArray(EMPTY_CHAR_SEQUENCE_ARRAY));
 
         final String theme = (K9.getK9Theme() == android.R.style.Theme) ? "dark" : "light";
         mTheme = setupListPreference(PREFERENCE_THEME, theme);
diff --git a/src/com/fsck/k9/mail/Address.java b/src/com/fsck/k9/mail/Address.java
index c9bcc9cc2..1a00c9930 100644
--- a/src/com/fsck/k9/mail/Address.java
+++ b/src/com/fsck/k9/mail/Address.java
@@ -279,10 +279,10 @@ public class Address
                 {
                     final SpannableString coloredName = new SpannableString(name);
                     coloredName.setSpan(new ForegroundColorSpan(K9.getContactNameColor()),
-                                  0,
-                                  coloredName.length(),
-                                  Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
-                                  );
+                                        0,
+                                        coloredName.length(),
+                                        Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
+                                       );
                     return coloredName;
                 }
                 else
diff --git a/src/com/fsck/k9/provider/MessageProvider.java b/src/com/fsck/k9/provider/MessageProvider.java
index 361be740f..c342d5e3d 100644
--- a/src/com/fsck/k9/provider/MessageProvider.java
+++ b/src/com/fsck/k9/provider/MessageProvider.java
@@ -183,8 +183,8 @@ public class MessageProvider extends ContentProvider
         {
             final Message message = source.message;
             return CONTENT_URI + "/delete_message/"
-                    + message.getFolder().getAccount().getAccountNumber() + "/"
-                    + message.getFolder().getName() + "/" + message.getUid();
+                   + message.getFolder().getAccount().getAccountNumber() + "/"
+                   + message.getFolder().getName() + "/" + message.getUid();
         }
     }
     public static class SenderExtractor implements FieldExtractor<MessageInfoHolder, CharSequence>