--- kdepim-3.4.1/kmail/kmsender.cpp.orig	2005-07-28 10:24:56.000000000 -0300
+++ kdepim-3.4.1/kmail/kmsender.cpp	2005-07-28 10:25:36.000000000 -0300
@@ -513,8 +513,10 @@
 	       .arg(mCurrentMsg->subject()));
   if (!mSendProc->send(mCurrentMsg))
   {
-    mCurrentMsg->setTransferInProgress( false );
-    mOutboxFolder->unGetMsg( mFailedMessages );
+    if (mCurrentMsg)
+      mCurrentMsg->setTransferInProgress( false );
+    if (mOutboxFolder)
+      mOutboxFolder->unGetMsg( mFailedMessages );
     mCurrentMsg = 0;
     cleanup();
     setStatusMsg(i18n("Failed to send (some) queued messages."));