diff --git a/src/com/fsck/k9/Account.java b/src/com/fsck/k9/Account.java
index c66b48a58..6d52c6bd8 100644
--- a/src/com/fsck/k9/Account.java
+++ b/src/com/fsck/k9/Account.java
@@ -59,7 +59,7 @@ public class Account implements BaseAccount
     public static final String TYPE_WIFI = "WIFI";
     public static final String TYPE_MOBILE = "MOBILE";
     public static final String TYPE_OTHER = "OTHER";
-    private static String[] networkTypes = { TYPE_WIFI, TYPE_MOBILE, TYPE_OTHER };
+    private static final String[] networkTypes = { TYPE_WIFI, TYPE_MOBILE, TYPE_OTHER };
 
     private static final String DEFAULT_QUOTE_PREFIX = ">";
 
@@ -75,7 +75,7 @@ public class Account implements BaseAccount
      */
     private int mDeletePolicy;
 
-    private String mUuid;
+    private final String mUuid;
     private String mStoreUri;
 
     /**
@@ -88,7 +88,7 @@ public class Account implements BaseAccount
      * True if {@link #mLocalStoreUri} may be in use at
      * the moment.
      */
-    private boolean mIsInUse = false;
+    private final boolean mIsInUse = false;
     private LocalStoreMigrationListener mLocalStoreMigrationListener;
     private String mTransportUri;
     private String mDescription;
@@ -123,7 +123,7 @@ public class Account implements BaseAccount
     private int mMaxPushFolders;
     private int mIdleRefreshMinutes;
     private boolean goToUnreadMessageSearch;
-    private Map<String, Boolean> compressionMap = new ConcurrentHashMap<String, Boolean>();
+    private final Map<String, Boolean> compressionMap = new ConcurrentHashMap<String, Boolean>();
     private Searchable searchableFolders;
     private boolean subscribedFoldersOnly;
     private int maximumPolledMessageAge;
diff --git a/src/com/fsck/k9/EmailAddressAdapter.java b/src/com/fsck/k9/EmailAddressAdapter.java
index 8c19e01dc..6a9fac8ac 100644
--- a/src/com/fsck/k9/EmailAddressAdapter.java
+++ b/src/com/fsck/k9/EmailAddressAdapter.java
@@ -39,7 +39,7 @@ public class EmailAddressAdapter extends ResourceCursorAdapter
     }
 
 
-    private Contacts mContacts;
+    private final Contacts mContacts;
 
     private EmailAddressAdapter(Context context)
     {
diff --git a/src/com/fsck/k9/controller/MessagingController.java b/src/com/fsck/k9/controller/MessagingController.java
index 098b38964..449692037 100644
--- a/src/com/fsck/k9/controller/MessagingController.java
+++ b/src/com/fsck/k9/controller/MessagingController.java
@@ -140,7 +140,7 @@ public class MessagingController implements Runnable
 
     private HashMap<SORT_TYPE, Boolean> sortAscending = new HashMap<SORT_TYPE, Boolean>();
 
-    private ConcurrentHashMap<String, AtomicInteger> sendCount = new ConcurrentHashMap<String, AtomicInteger>();
+    private final ConcurrentHashMap<String, AtomicInteger> sendCount = new ConcurrentHashMap<String, AtomicInteger>();
 
     ConcurrentHashMap<Account, Pusher> pushers = new ConcurrentHashMap<Account, Pusher>();