diff --git a/src/com/fsck/k9/Account.java b/src/com/fsck/k9/Account.java
index 814ed07a1..4f196e0f5 100644
--- a/src/com/fsck/k9/Account.java
+++ b/src/com/fsck/k9/Account.java
@@ -1491,8 +1491,10 @@ public class Account implements BaseAccount
         lastSelectedFolderName = folderName;
     }
 
-    public synchronized CryptoProvider getCryptoProvider() {
-        if (mCryptoProvider == null) {
+    public synchronized CryptoProvider getCryptoProvider()
+    {
+        if (mCryptoProvider == null)
+        {
             mCryptoProvider = CryptoProvider.createInstance(getCryptoApp());
         }
         return mCryptoProvider;
diff --git a/src/com/fsck/k9/activity/MessageCompose.java b/src/com/fsck/k9/activity/MessageCompose.java
index fa774bf28..cc4607023 100644
--- a/src/com/fsck/k9/activity/MessageCompose.java
+++ b/src/com/fsck/k9/activity/MessageCompose.java
@@ -1733,8 +1733,8 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
                     final String escapedPrefix = prefix.replaceAll("(\\\\|\\$)", "\\\\$1");
 
                     final String text = (mSourceMessageBody != null) ?
-                            mSourceMessageBody :
-                            MimeUtility.getTextFromPart(part);
+                                        mSourceMessageBody :
+                                        MimeUtility.getTextFromPart(part);
 
                     final String wrappedText = Utility.wrap(text, REPLY_WRAP_LINE_WIDTH - prefix.length());
 
diff --git a/src/com/fsck/k9/activity/setup/AccountSettings.java b/src/com/fsck/k9/activity/setup/AccountSettings.java
index 9afd9fc9d..5cd2b2143 100644
--- a/src/com/fsck/k9/activity/setup/AccountSettings.java
+++ b/src/com/fsck/k9/activity/setup/AccountSettings.java
@@ -787,8 +787,8 @@ public class AccountSettings extends K9PreferenceActivity
         // Do the vibration to show the user what it's like.
         Vibrator vibrate = (Vibrator)preference.getContext().getSystemService(Context.VIBRATOR_SERVICE);
         long[] pattern = MessagingController.getVibratePattern(
-                Integer.parseInt(mAccountVibratePattern.getValue()),
-                Integer.parseInt(mAccountVibrateTimes.getValue()));
+                             Integer.parseInt(mAccountVibratePattern.getValue()),
+                             Integer.parseInt(mAccountVibrateTimes.getValue()));
         vibrate.vibrate(pattern, -1);
     }
 }
diff --git a/src/com/fsck/k9/controller/MessagingController.java b/src/com/fsck/k9/controller/MessagingController.java
index 83981468d..701dc8779 100644
--- a/src/com/fsck/k9/controller/MessagingController.java
+++ b/src/com/fsck/k9/controller/MessagingController.java
@@ -2499,13 +2499,13 @@ public class MessagingController implements Runnable
         Store remoteStore = account.getRemoteStore();
         Folder remoteFolder = remoteStore.getFolder(folder);
         if (!remoteFolder.exists() ||
-            /*
-             * Don't proceed if the remote folder doesn't support flags and
-             * the flag to be changed isn't the deleted flag. This avoids
-             * unnecessary connections to POP3 servers.
-             */
-            // TODO: This should actually call a supportsSettingFlag(flag) method.
-            (!remoteFolder.supportsFetchingFlags() && !Flag.DELETED.equals(flag)))
+                /*
+                 * Don't proceed if the remote folder doesn't support flags and
+                 * the flag to be changed isn't the deleted flag. This avoids
+                 * unnecessary connections to POP3 servers.
+                 */
+                // TODO: This should actually call a supportsSettingFlag(flag) method.
+                (!remoteFolder.supportsFetchingFlags() && !Flag.DELETED.equals(flag)))
         {
             return;
         }
diff --git a/src/com/fsck/k9/crypto/PgpData.java b/src/com/fsck/k9/crypto/PgpData.java
index 17d98be85..a97c4152b 100644
--- a/src/com/fsck/k9/crypto/PgpData.java
+++ b/src/com/fsck/k9/crypto/PgpData.java
@@ -2,7 +2,8 @@ package com.fsck.k9.crypto;
 
 import java.io.Serializable;
 
-public class PgpData implements Serializable {
+public class PgpData implements Serializable
+{
     protected long mEncryptionKeyIds[] = null;
     protected long mSignatureKeyId = 0;
     protected String mSignatureUserId = null;
diff --git a/src/com/fsck/k9/mail/internet/MimeHeader.java b/src/com/fsck/k9/mail/internet/MimeHeader.java
index 0a2923a4b..03f5c9f01 100644
--- a/src/com/fsck/k9/mail/internet/MimeHeader.java
+++ b/src/com/fsck/k9/mail/internet/MimeHeader.java
@@ -166,9 +166,9 @@ public class MimeHeader
 
         public String toString()
         {
-          StringBuilder sb = new StringBuilder("(");
-           sb.append(name).append('=').append(value).append(')');
-           return sb.toString();
-    	}
+            StringBuilder sb = new StringBuilder("(");
+            sb.append(name).append('=').append(value).append(')');
+            return sb.toString();
+        }
     }
 }
diff --git a/src/com/fsck/k9/provider/MessageProvider.java b/src/com/fsck/k9/provider/MessageProvider.java
index 2f6e54ddd..f2e194d9a 100644
--- a/src/com/fsck/k9/provider/MessageProvider.java
+++ b/src/com/fsck/k9/provider/MessageProvider.java
@@ -202,9 +202,10 @@ public class MessageProvider extends ContentProvider
 
     public void setApplication(Application app)
     {
-    	if (context == null) {
-    		context = app.getApplicationContext();
-    	}
+        if (context == null)
+        {
+            context = app.getApplicationContext();
+        }
         if (app != null)
         {
             mApp = app;