diff --git a/provider_src/com/android/email/mail/store/ImapFolder.java b/provider_src/com/android/email/mail/store/ImapFolder.java
index 13361650b..493035a73 100644
--- a/provider_src/com/android/email/mail/store/ImapFolder.java
+++ b/provider_src/com/android/email/mail/store/ImapFolder.java
@@ -1608,8 +1608,8 @@ public class ImapFolder extends Folder {
 
             } catch (Exception ex) {
                 if (Logging.LOGD) {
-                    LogUtils.e(LOG_TAG, "Failure processing imap change (" + change
-                            + ") for mailbox " + mName, ex);
+                    LogUtils.e(LOG_TAG, ex, "Failure processing imap change (" + change
+                            + ") for mailbox " + mName);
                 }
             }
         }
diff --git a/provider_src/com/android/email/service/ImapService.java b/provider_src/com/android/email/service/ImapService.java
index 9ed57b8c8..3c1a5431a 100644
--- a/provider_src/com/android/email/service/ImapService.java
+++ b/provider_src/com/android/email/service/ImapService.java
@@ -223,7 +223,7 @@ public class ImapService extends Service {
         @Override
         public void onException(MessagingException ex) {
             // Reschedule a new ping
-            LogUtils.e(LOG_TAG, "Ping exception for mailbox " + mMailbox.mId, ex);
+            LogUtils.e(LOG_TAG, ex, "Ping exception for mailbox " + mMailbox.mId);
             cancelKickIdleConnection();
             internalUnregisterFolderIdle();
             reschedulePing(increasePingDelay());
@@ -267,7 +267,7 @@ public class ImapService extends Service {
                         ImapIdleFolderHolder holder = ImapIdleFolderHolder.getInstance();
                         holder.registerMailboxForIdle(mContext, account, mMailbox);
                     } catch (MessagingException ex) {
-                        LogUtils.w(LOG_TAG, "Failed to register mailbox for idle. Reschedule.", ex);
+                        LogUtils.w(LOG_TAG, ex, "Failed to register mailbox for idle. Reschedule.");
                         reschedulePing(increasePingDelay());
                     }
                 }
@@ -368,7 +368,7 @@ public class ImapService extends Service {
                     LogUtils.i(LOG_TAG, "Registered idle for mailbox " + mailbox.mId);
                     return true;
                 } catch (Exception ex) {
-                    LogUtils.i(LOG_TAG, "Failed to register idle for mailbox " + mailbox.mId, ex);
+                    LogUtils.i(LOG_TAG, ex, "Failed to register idle for mailbox " + mailbox.mId);
                 }
                 return false;
             }
@@ -1857,7 +1857,7 @@ public class ImapService extends Service {
 
         } catch (MessagingException ex) {
             if (Logging.LOGD) {
-                LogUtils.d(Logging.LOG_TAG, "processImapFetchChanges", ex);
+                LogUtils.d(Logging.LOG_TAG, ex, "processImapFetchChanges");
             }
             if (ex instanceof AuthenticationFailedException) {
                 // Generate authentication notification