1 files changed, 3 insertions, 2 deletions
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()