diff --git a/src/com/fsck/k9/Account.java b/src/com/fsck/k9/Account.java
index 45859b9c4..56830789d 100644
--- a/src/com/fsck/k9/Account.java
+++ b/src/com/fsck/k9/Account.java
@@ -76,7 +76,7 @@ public class Account implements Serializable
     public static final String EXPUNGE_IMMEDIATELY = "EXPUNGE_IMMEDIATELY";
     public static final String EXPUNGE_MANUALLY = "EXPUNGE_MANUALLY";
     public static final String EXPUNGE_ON_POLL = "EXPUNGE_ON_POLL";
-    
+
     /**
      * <pre>
      * 0 Never
diff --git a/src/com/fsck/k9/K9.java b/src/com/fsck/k9/K9.java
index 9f704ed6f..390ac10d0 100644
--- a/src/com/fsck/k9/K9.java
+++ b/src/com/fsck/k9/K9.java
@@ -61,7 +61,7 @@ public class K9 extends Application
      */
     public static boolean ENABLE_ERROR_FOLDER = true;
     public static String ERROR_FOLDER_NAME = "K9mail-errors";
-    
+
     private static boolean mAnimations = true;
 
     /**
diff --git a/src/com/fsck/k9/MessagingController.java b/src/com/fsck/k9/MessagingController.java
index 7b6b9a285..b8935a69f 100644
--- a/src/com/fsck/k9/MessagingController.java
+++ b/src/com/fsck/k9/MessagingController.java
@@ -993,10 +993,10 @@ public class MessagingController implements Runnable
 
             int unreadMessageCount = setLocalUnreadCountToRemote(localFolder, remoteFolder,  newMessages);
 
-	    for (MessagingListener l : getListeners())
-	    {
-		l.folderStatusChanged(account, folder, unreadMessageCount);
-	    }
+            for (MessagingListener l : getListeners())
+            {
+                l.folderStatusChanged(account, folder, unreadMessageCount);
+            }
 
             /*
              * Notify listeners that we're finally done.
@@ -3407,7 +3407,7 @@ public class MessagingController implements Runnable
     }
 
     public void expunge(final Account account, final String folder, final MessagingListener listener)
-    {   
+    {
         putBackground("expunge", null, new Runnable()
         {
             public void run()
diff --git a/src/com/fsck/k9/activity/FolderList.java b/src/com/fsck/k9/activity/FolderList.java
index 3a7008f0d..710a97c4f 100644
--- a/src/com/fsck/k9/activity/FolderList.java
+++ b/src/com/fsck/k9/activity/FolderList.java
@@ -480,7 +480,7 @@ public class FolderList extends K9ListActivity
 
         MessagingController.getInstance(getApplication()).emptyTrash(account, null);
     }
-    
+
     private void onExpunge(final Account account, String folderName)
     {
         MessagingController.getInstance(getApplication()).expunge(account, folderName, null);
diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java
index c246408ae..ed070916f 100644
--- a/src/com/fsck/k9/activity/MessageList.java
+++ b/src/com/fsck/k9/activity/MessageList.java
@@ -678,7 +678,7 @@ public class MessageList
 
     private void onOpenMessage(MessageInfoHolder message)
     {
-        if ( message.folder.name.equals(message.account.getDraftsFolderName()))
+        if (message.folder.name.equals(message.account.getDraftsFolderName()))
         {
             MessageCompose.actionEditDraft(this, message.account, message.message);
         }
@@ -1496,9 +1496,10 @@ public class MessageList
         AdapterContextMenuInfo info = (AdapterContextMenuInfo) menuInfo;
         MessageInfoHolder message = (MessageInfoHolder) mAdapter.getItem(info.position);
 
-        // in multi-select mode, the context menu pops up unintentionally 
+        // in multi-select mode, the context menu pops up unintentionally
         // causes misclicks
-        if (mSelectedWidget == WIDGET_MULTISELECT) {
+        if (mSelectedWidget == WIDGET_MULTISELECT)
+        {
             return;
         }
 
diff --git a/src/com/fsck/k9/activity/setup/AccountSettings.java b/src/com/fsck/k9/activity/setup/AccountSettings.java
index 7bd5191d7..c2394ff38 100644
--- a/src/com/fsck/k9/activity/setup/AccountSettings.java
+++ b/src/com/fsck/k9/activity/setup/AccountSettings.java
@@ -180,7 +180,7 @@ public class AccountSettings extends K9PreferenceActivity
                 return false;
             }
         });
-        
+
         mPushLimit = (ListPreference) findPreference(PREFERENCE_PUSH_LIMIT);
         mPushLimit.setEnabled(isPushCapable);
         mPushLimit.setValue(String.valueOf(mAccount.getMaxPushFolders()));
@@ -226,7 +226,7 @@ public class AccountSettings extends K9PreferenceActivity
                 return false;
             }
         });
-        
+
 
         mExpungePolicy = (ListPreference) findPreference(PREFERENCE_EXPUNGE_POLICY);
         mExpungePolicy.setEnabled(isExpungeCapable);
@@ -243,7 +243,7 @@ public class AccountSettings extends K9PreferenceActivity
                 return false;
             }
         });
-        
+
         mDisplayCount = (ListPreference) findPreference(PREFERENCE_DISPLAY_COUNT);
         mDisplayCount.setValue(String.valueOf(mAccount.getDisplayCount()));
         mDisplayCount.setSummary(mDisplayCount.getEntry());
diff --git a/src/com/fsck/k9/mail/Folder.java b/src/com/fsck/k9/mail/Folder.java
index 0e81c3c03..9e6c84adc 100644
--- a/src/com/fsck/k9/mail/Folder.java
+++ b/src/com/fsck/k9/mail/Folder.java
@@ -118,7 +118,7 @@ public abstract class Folder
     public abstract String getUidFromMessageId(Message message) throws MessagingException;
 
     public void expunge() throws MessagingException
-    {}
+        {}
 
     public abstract void fetch(Message[] messages, FetchProfile fp,
                                MessageRetrievalListener listener) throws MessagingException;
diff --git a/src/com/fsck/k9/mail/Store.java b/src/com/fsck/k9/mail/Store.java
index e2d7741e3..5931b534e 100644
--- a/src/com/fsck/k9/mail/Store.java
+++ b/src/com/fsck/k9/mail/Store.java
@@ -110,8 +110,8 @@ public abstract class Store
     {
         return false;
     }
-    
-    
+
+
     public void sendMessages(Message[] messages) throws MessagingException
     {
     }
diff --git a/src/com/fsck/k9/mail/store/ImapStore.java b/src/com/fsck/k9/mail/store/ImapStore.java
index 5f6c92b71..5d339fbef 100644
--- a/src/com/fsck/k9/mail/store/ImapStore.java
+++ b/src/com/fsck/k9/mail/store/ImapStore.java
@@ -163,7 +163,7 @@ public class ImapStore extends Store
                 mAuthType = AuthType.PLAIN;
                 mUsername = userInfoParts[0];
                 mPassword = userInfoParts[1];
-            } 
+            }
             else
             {
                 mAuthType = AuthType.valueOf(userInfoParts[0]);
@@ -600,7 +600,7 @@ public class ImapStore extends Store
             {
                 return;
             }
-            
+
             synchronized (this)
             {
                 releaseConnection(mConnection);
diff --git a/src/com/fsck/k9/service/CoreService.java b/src/com/fsck/k9/service/CoreService.java
index 6e1705f38..2788147d7 100644
--- a/src/com/fsck/k9/service/CoreService.java
+++ b/src/com/fsck/k9/service/CoreService.java
@@ -33,13 +33,13 @@ public abstract class CoreService extends Service
         WakeLock wakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "K9");
         wakeLock.setReferenceCounted(false);
         wakeLock.acquire(K9.MAIL_SERVICE_WAKE_LOCK_TIMEOUT);
-        
+
         Integer tmpWakeLockId = wakeLockSeq.getAndIncrement();
         wakeLocks.put(tmpWakeLockId, wakeLock);
-        
+
         i.putExtra(WAKE_LOCK_ID, tmpWakeLockId);
     }
-    
+
     @Override
     public void onStart(Intent intent, int startId)
     {