Merge branch 'master' into removing-icu-dependency

3 files changed, 7 insertions, 4 deletions

diff --git a/src/core/abstract/MCAbstractPart.cc b/src/core/abstract/MCAbstractPart.cc
index 5b7a1c9a..04e99e4d 100644
--- a/src/core/abstract/MCAbstractPart.cc
+++ b/src/core/abstract/MCAbstractPart.cc
@@ -439,10 +439,11 @@ void AbstractPart::removeContentTypeParameter(String * name)
 
 String * AbstractPart::contentTypeParameterValueForName(String * name)
 {
+    String * result = NULL;
     mc_foreachhashmapKey(String, key, mContentTypeParameters) {
         if (key->isEqualCaseInsensitive(name)) {
-            return (String *) mContentTypeParameters->objectForKey(key);
+            result = (String *) mContentTypeParameters->objectForKey(key);
         }
     }
-    return NULL;
+    return result;
 }
diff --git a/src/core/abstract/MCMessageConstants.h b/src/core/abstract/MCMessageConstants.h
index c81f8360..1b45ea69 100644
--- a/src/core/abstract/MCMessageConstants.h
+++ b/src/core/abstract/MCMessageConstants.h
@@ -249,6 +249,7 @@ namespace mailcore {
         ErrorNoRecipient,
         ErrorNoop,
         ErrorGmailApplicationSpecificPasswordRequired,
+        ErrorServerDate,
     };
     
     enum PartType {
diff --git a/src/core/abstract/MCMessageHeader.cc b/src/core/abstract/MCMessageHeader.cc
index 89dec15c..08b0f045 100644
--- a/src/core/abstract/MCMessageHeader.cc
+++ b/src/core/abstract/MCMessageHeader.cc
@@ -337,12 +337,13 @@ void MessageHeader::removeExtraHeader(String * name)
 
 String * MessageHeader::extraHeaderValueForName(String * name)
 {
+    String * result = NULL;
     mc_foreachhashmapKey(String, key, mExtraHeaders) {
         if (key->isEqualCaseInsensitive(name)) {
-            return (String *) mExtraHeaders->objectForKey(key);
+            result = (String *) mExtraHeaders->objectForKey(key);
         }
     }
-    return NULL;
+    return result;
 }
 
 String * MessageHeader::extractedSubject()