diff --git a/k9mail-library/src/main/java/com/fsck/k9/mail/ssl/LocalKeyStore.java b/k9mail-library/src/main/java/com/fsck/k9/mail/ssl/LocalKeyStore.java
index 103c46806..bdfc0b2f6 100644
--- a/k9mail-library/src/main/java/com/fsck/k9/mail/ssl/LocalKeyStore.java
+++ b/k9mail-library/src/main/java/com/fsck/k9/mail/ssl/LocalKeyStore.java
@@ -92,7 +92,7 @@ public class LocalKeyStore {
             mKeyStore = store;
             mKeyStoreFile = file;
         } catch (Exception e) {
-            Timber.e("Failed to initialize local key store", e);
+            Timber.e(e, "Failed to initialize local key store");
             // Use of the local key store is effectively disabled.
             mKeyStore = null;
             mKeyStoreFile = null;
diff --git a/k9mail-library/src/main/java/com/fsck/k9/mail/store/imap/ImapConnection.java b/k9mail-library/src/main/java/com/fsck/k9/mail/store/imap/ImapConnection.java
index 82972662a..13c87994b 100644
--- a/k9mail-library/src/main/java/com/fsck/k9/mail/store/imap/ImapConnection.java
+++ b/k9mail-library/src/main/java/com/fsck/k9/mail/store/imap/ImapConnection.java
@@ -387,7 +387,7 @@ class ImapConnection {
     }
 
     private void handlePermanentXoauth2Failure(NegativeImapResponseException e) throws AuthenticationFailedException {
-        Timber.v(e, "Permanent failure during XOAUTH2", e);
+        Timber.v(e, "Permanent failure during XOAUTH2");
         throw new AuthenticationFailedException(e.getMessage(), e);
     }
 
@@ -397,13 +397,13 @@ class ImapConnection {
         //if a token was invalid before use (e.g. due to expiry). But we don't
         //This is the intended behaviour per AccountManager
 
-        Timber.v(e, "Temporary failure - retrying with new token", e);
+        Timber.v(e, "Temporary failure - retrying with new token");
         try {
             attemptXOAuth2();
         } catch (NegativeImapResponseException e2) {
             //Okay, we failed on a new token.
             //Invalidate the token anyway but assume it's permanent.
-            Timber.v(e, "Authentication exception for new token, permanent error assumed", e);
+            Timber.v(e, "Authentication exception for new token, permanent error assumed");
             oauthTokenProvider.invalidateToken(settings.getUsername());
             handlePermanentXoauth2Failure(e2);
         }
@@ -581,7 +581,7 @@ class ImapConnection {
             }
         } catch (IOException e) {
             close();
-            Timber.e(e, "Error enabling compression", e);
+            Timber.e(e, "Error enabling compression");
         }
     }
 
@@ -632,7 +632,7 @@ class ImapConnection {
         try {
             listResponses = executeSimpleCommand(Commands.LIST + " \"\" \"\"");
         } catch (NegativeImapResponseException e) {
-            Timber.d(e, "Error getting path delimiter using LIST command", e);
+            Timber.d(e, "Error getting path delimiter using LIST command");
             return;
         }
 
diff --git a/k9mail-library/src/main/java/com/fsck/k9/mail/store/imap/ImapFolderPusher.java b/k9mail-library/src/main/java/com/fsck/k9/mail/store/imap/ImapFolderPusher.java
index 8ef2ca50a..66bafbecf 100644
--- a/k9mail-library/src/main/java/com/fsck/k9/mail/store/imap/ImapFolderPusher.java
+++ b/k9mail-library/src/main/java/com/fsck/k9/mail/store/imap/ImapFolderPusher.java
@@ -638,7 +638,7 @@ class ImapFolderPusher extends ImapFolder {
 
                 pushReceiver.messagesRemoved(ImapFolderPusher.this, messages);
             } catch (Exception e) {
-                Timber.e("Cannot remove EXPUNGEd messages", e);
+                Timber.e("Cannot remove EXPUNGEd messages");
             }
         }
 
diff --git a/k9mail-library/src/main/java/com/fsck/k9/mail/transport/smtp/SmtpTransport.java b/k9mail-library/src/main/java/com/fsck/k9/mail/transport/smtp/SmtpTransport.java
index 9fff90e84..3a2e548d0 100644
--- a/k9mail-library/src/main/java/com/fsck/k9/mail/transport/smtp/SmtpTransport.java
+++ b/k9mail-library/src/main/java/com/fsck/k9/mail/transport/smtp/SmtpTransport.java
@@ -859,7 +859,7 @@ public class SmtpTransport extends Transport {
         //if a token was invalid before use (e.g. due to expiry). But we don't
         //This is the intended behaviour per AccountManager
 
-        Timber.v("Authentication exception, re-trying with new token", negativeResponseFromOldToken);
+        Timber.v(negativeResponseFromOldToken, "Authentication exception, re-trying with new token");
         try {
             attemptXoauth2(username);
         } catch (NegativeSmtpReplyException negativeResponseFromNewToken) {
@@ -869,8 +869,7 @@ public class SmtpTransport extends Transport {
 
             //Okay, we failed on a new token.
             //Invalidate the token anyway but assume it's permanent.
-            Timber.v("Authentication exception for new token, permanent error assumed",
-                    negativeResponseFromNewToken);
+            Timber.v(negativeResponseFromNewToken, "Authentication exception for new token, permanent error assumed");
 
             oauthTokenProvider.invalidateToken(username);