3 files changed, 3 insertions, 8 deletions
diff --git a/mailnews/import/outlook/src/MapiApi.cpp b/mailnews/import/outlook/src/MapiApi.cpp
index d6a159754..d23b44dd1 100644
--- a/mailnews/import/outlook/src/MapiApi.cpp
+++ b/mailnews/import/outlook/src/MapiApi.cpp
@@ -887,7 +887,7 @@ BOOL CMapiApi::IterateStores(CMapiFolderList& stores)
 
   if (!m_lpSession) {
     MAPI_TRACE0("IterateStores called before session is open\n");
-    m_lastError = -1;
+    m_lastError = E_UNEXPECTED;
     return FALSE;
   }
 
@@ -1124,7 +1124,7 @@ CMsgStore *  CMapiApi::FindMessageStore(ULONG cbEid, LPENTRYID lpEid)
 {
   if (!m_lpSession) {
     MAPI_TRACE0("FindMessageStore called before session is open\n");
-    m_lastError = -1;
+    m_lastError = E_UNEXPECTED;
     return NULL;
   }
 
@@ -1409,9 +1409,6 @@ void CMapiApi::ReportLongProp(const char *pTag, LPSPropValue pVal)
   else if (pVal && (PROP_TYPE(pVal->ulPropTag) == PT_ERROR)) {
     MAPI_TRACE1("%s {Error retrieving property}\n", pTag);
   }
-  else if (pVal && (PROP_TYPE(pVal->ulPropTag) == PT_ERROR)) {
-    MAPI_TRACE1("%s {Error retrieving property}\n", pTag);
-  }
   else {
     MAPI_TRACE1("%s invalid value, expecting long\n", pTag);
   }
@@ -1843,7 +1840,7 @@ BOOL CMapiFolderContents::SetUpIter(void)
   }
 
   if (ulObjType != MAPI_FOLDER) {
-    m_lastError = -1;
+    m_lastError = E_UNEXPECTED;
     MAPI_TRACE0("CMapiFolderContents - bad object type, not a folder.\n");
     return FALSE;
   }
diff --git a/mailnews/mime/emitters/nsEmitterUtils.cpp b/mailnews/mime/emitters/nsEmitterUtils.cpp
index 551bf5b31..2867596ab 100644
--- a/mailnews/mime/emitters/nsEmitterUtils.cpp
+++ b/mailnews/mime/emitters/nsEmitterUtils.cpp
@@ -54,7 +54,6 @@ EmitThisHeaderForPrefSetting(int32_t dispType, const char *header)
         (!strcmp(header, HEADER_FOLLOWUP_TO)) ||
         (!strcmp(header, HEADER_CC)) ||
         (!strcmp(header, HEADER_ORGANIZATION)) ||
-        (!strcmp(header, HEADER_REPLY_TO)) ||
         (!strcmp(header, HEADER_BCC))
        )
        return true;
diff --git a/mailnews/mime/src/mimemsig.cpp b/mailnews/mime/src/mimemsig.cpp
index bb34607cb..5b4f8e556 100644
--- a/mailnews/mime/src/mimemsig.cpp
+++ b/mailnews/mime/src/mimemsig.cpp
@@ -599,7 +599,6 @@ MimeMultipartSigned_emit_child (MimeObject *obj)
     obj->options->headers != MimeHeadersCitation &&
     obj->options->write_html_p &&
     obj->options->output_fn &&
-    obj->options->headers != MimeHeadersCitation &&
     sig->crypto_closure)
   {
     // Calling crypto_generate_html may trigger wanted side effects,