diff --git a/mailnews/compose/src/nsMsgCompUtils.cpp b/mailnews/compose/src/nsMsgCompUtils.cpp
index eb8141f22067..13555dd2b008 100644
--- a/mailnews/compose/src/nsMsgCompUtils.cpp
+++ b/mailnews/compose/src/nsMsgCompUtils.cpp
@@ -2039,6 +2039,11 @@ GetFolderURIFromUserPrefs(nsMsgDeliverMode   aMode,
     if (NS_FAILED(rv) || !prefs) 
       return nsnull;
     rv = prefs->CopyCharPref("mail.default_sendlater_uri", &uri);
+   
+    if (NS_FAILED(rv) || !uri) {
+	uri = PR_smprintf("%s", ANY_SERVER);
+	rv = NS_OK;
+    }
   }
   else if (aMode == nsMsgSaveAsDraft)    // SaveAsDraft (Drafts)
   {
diff --git a/mailnews/compose/src/nsMsgCompUtils.h b/mailnews/compose/src/nsMsgCompUtils.h
index f0b0a8880d52..f000f104b437 100644
--- a/mailnews/compose/src/nsMsgCompUtils.h
+++ b/mailnews/compose/src/nsMsgCompUtils.h
@@ -25,6 +25,8 @@
 #include "nsMsgCompFields.h"
 #include "nsIMsgSend.h"
 
+#define ANY_SERVER "anyfolder://"
+
 NS_BEGIN_EXTERN_C
 
 //
diff --git a/mailnews/compose/src/nsMsgCopy.cpp b/mailnews/compose/src/nsMsgCopy.cpp
index 8890d39dd800..ae2bb19b5cd4 100644
--- a/mailnews/compose/src/nsMsgCopy.cpp
+++ b/mailnews/compose/src/nsMsgCopy.cpp
@@ -34,8 +34,7 @@
 #include "nsRDFCID.h"
 #include "nsIURL.h"
 #include "nsMsgComposeStringBundle.h"
-
-#define ANY_SERVER "anyfolder://"
+#include "nsMsgCompUtils.h"
 
 static NS_DEFINE_CID(kStandardUrlCID, NS_STANDARDURL_CID);
 static NS_DEFINE_CID(kMsgCopyServiceCID,NS_MSGCOPYSERVICE_CID);
diff --git a/mailnews/compose/src/nsMsgSend.cpp b/mailnews/compose/src/nsMsgSend.cpp
index d98d917a264a..89bf68bdb6be 100644
--- a/mailnews/compose/src/nsMsgSend.cpp
+++ b/mailnews/compose/src/nsMsgSend.cpp
@@ -3299,6 +3299,9 @@ nsMsgComposeAndSend::MimeDoFCC(nsFileSpec       *input_file,
     // Need to determine what type of operation failed and set status accordingly. 
     switch (mode)
     {
+    case nsMsgQueueForLater:
+      status = NS_MSG_UNABLE_TO_SEND_LATER;
+      break;
     case nsMsgSaveAsDraft:
       status = NS_MSG_UNABLE_TO_SAVE_DRAFT;
       break;