diff --git a/src/com/fsck/k9/activity/FolderList.java b/src/com/fsck/k9/activity/FolderList.java
index 10f2894d6..0fb6034c7 100644
--- a/src/com/fsck/k9/activity/FolderList.java
+++ b/src/com/fsck/k9/activity/FolderList.java
@@ -319,7 +319,7 @@ public class FolderList extends K9ListActivity
             finish();
         }
         else if (intent.getBooleanExtra(EXTRA_FROM_SHORTCUT, false) &&
-                !K9.FOLDER_NONE.equals(mAccount.getAutoExpandFolderName()))
+                 !K9.FOLDER_NONE.equals(mAccount.getAutoExpandFolderName()))
         {
             onOpenFolder(mAccount.getAutoExpandFolderName());
             finish();
diff --git a/src/com/fsck/k9/activity/K9Activity.java b/src/com/fsck/k9/activity/K9Activity.java
index b5e9507d4..6bb0a6139 100644
--- a/src/com/fsck/k9/activity/K9Activity.java
+++ b/src/com/fsck/k9/activity/K9Activity.java
@@ -57,7 +57,7 @@ public class K9Activity extends Activity
         Configuration config = new Configuration();
         config.locale = locale;
         context.getResources().updateConfiguration(config,
-                                                   context.getResources().getDisplayMetrics());
+                context.getResources().getDisplayMetrics());
     }
 
     @Override
diff --git a/src/com/fsck/k9/activity/LauncherShortcuts.java b/src/com/fsck/k9/activity/LauncherShortcuts.java
index c316034a4..f92a47443 100644
--- a/src/com/fsck/k9/activity/LauncherShortcuts.java
+++ b/src/com/fsck/k9/activity/LauncherShortcuts.java
@@ -34,7 +34,8 @@ public class LauncherShortcuts extends K9ListActivity implements OnItemClickList
         super.onCreate(icicle);
 
         // finish() immediately if we aren't supposed to be here
-        if (!Intent.ACTION_CREATE_SHORTCUT.equals(getIntent().getAction())) {
+        if (!Intent.ACTION_CREATE_SHORTCUT.equals(getIntent().getAction()))
+        {
             finish();
             return;
         }
diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java
index 6a32493ef..00106bc64 100644
--- a/src/com/fsck/k9/activity/MessageList.java
+++ b/src/com/fsck/k9/activity/MessageList.java
@@ -527,7 +527,8 @@ public class MessageList
         mState.putInt(EXTRA_LIST_POSITION, mListView.getSelectedItemPosition());
     }
 
-    public void restoreListState() {
+    public void restoreListState()
+    {
         if (mState == null)
         {
             return;
@@ -2508,7 +2509,7 @@ public class MessageList
                 LocalMessage message = (LocalMessage) m;
                 Date date = message.getSentDate();
                 this.compareDate = message.getInternalDate();
-                if (this.compareDate == null) 
+                if (this.compareDate == null)
                 {
                     this.compareDate = message.getSentDate();
                 }
diff --git a/src/com/fsck/k9/activity/MessageView.java b/src/com/fsck/k9/activity/MessageView.java
index 6844815a1..da9518f27 100644
--- a/src/com/fsck/k9/activity/MessageView.java
+++ b/src/com/fsck/k9/activity/MessageView.java
@@ -1943,7 +1943,7 @@ public class MessageView extends K9Activity implements OnClickListener
                     {
                         mHandler.networkError();
                     }
-                    if ((MessageView.this.mMessage == null) || 
+                    if ((MessageView.this.mMessage == null) ||
                             !MessageView.this.mMessage.isSet(Flag.X_DOWNLOADED_PARTIAL))
                     {
                         mMessageContentView.loadUrl("file:///android_asset/empty.html");
@@ -2150,9 +2150,9 @@ public class MessageView extends K9Activity implements OnClickListener
         try
         {
             mToggleScrollView.setScrolling(false);
-            
+
             KeyEvent shiftPressEvent = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN,
-                    KeyEvent.KEYCODE_SHIFT_LEFT, 0, 0);
+                                                    KeyEvent.KEYCODE_SHIFT_LEFT, 0, 0);
             shiftPressEvent.dispatch(view);
         }
         catch (Exception e)
diff --git a/src/com/fsck/k9/controller/MessagingController.java b/src/com/fsck/k9/controller/MessagingController.java
index 382dafce9..9dabd225a 100644
--- a/src/com/fsck/k9/controller/MessagingController.java
+++ b/src/com/fsck/k9/controller/MessagingController.java
@@ -1631,13 +1631,13 @@ public class MessagingController implements Runnable
                 {
 
 
-                    if (isMessageSuppressed(account, folder, message ))
+                    if (isMessageSuppressed(account, folder, message))
                     {
                         if (K9.DEBUG)
                         {
                             Log.d(K9.LOG_TAG, "Message " + message.getUid() + " was suppressed "+
-                                "but just downloaded. "+
-                                "The race condition means we wasted some bandwidth. Oh well.");
+                                  "but just downloaded. "+
+                                  "The race condition means we wasted some bandwidth. Oh well.");
                         }
                         progress.incrementAndGet();
 
@@ -2752,7 +2752,8 @@ public class MessagingController implements Runnable
             t.printStackTrace(ps);
             ps.close();
 
-            if (subject == null) {
+            if (subject == null)
+            {
                 subject = getRootCauseMessage(t);
             }