diff --git a/mailnews/base/src/nsMsgOfflineManager.cpp b/mailnews/base/src/nsMsgOfflineManager.cpp
index 36463ccdda5..f31153cf0d6 100644
--- a/mailnews/base/src/nsMsgOfflineManager.cpp
+++ b/mailnews/base/src/nsMsgOfflineManager.cpp
@@ -119,9 +119,9 @@ nsresult nsMsgOfflineManager::AdvanceToNextState(nsresult exitStatus)
     {
     case eNoState:
 
+      m_curState = eSendingUnsent;
       if (m_sendUnsentMessages)
       {
-        m_curState = eSendingUnsent;
         SendUnsentMessages();
       }
       else