1 files changed, 46 insertions, 9 deletions
diff --git a/src/java/native/com_libmailcore_MessageHeader.cpp b/src/java/native/com_libmailcore_MessageHeader.cpp
index b5774cdd..a161df0b 100644
--- a/src/java/native/com_libmailcore_MessageHeader.cpp
+++ b/src/java/native/com_libmailcore_MessageHeader.cpp
@@ -15,7 +15,10 @@ MC_JAVA_SYNTHESIZE_STRING(setMessageID, messageID)
 JNIEXPORT jboolean JNICALL Java_com_libmailcore_MessageHeader_isMessageIDAutoGenerated
   (JNIEnv * env, jobject obj)
 {
-    return (jboolean) MC_JAVA_NATIVE_INSTANCE->isMessageIDAutoGenerated();
+    MC_POOL_BEGIN;
+    jboolean result = (jboolean) MC_JAVA_NATIVE_INSTANCE->isMessageIDAutoGenerated();
+    MC_POOL_END;
+    return result;
 }
 
 MC_JAVA_SYNTHESIZE(Array, setReferences, references)
@@ -24,25 +27,35 @@ MC_JAVA_SYNTHESIZE(Array, setInReplyTo, inReplyTo)
 JNIEXPORT jobject JNICALL Java_com_libmailcore_MessageHeader_date
   (JNIEnv * env, jobject obj)
 {
-    return timeToJavaDate(env, MC_JAVA_NATIVE_INSTANCE->date());
+    MC_POOL_BEGIN;
+    jobject result = timeToJavaDate(env, MC_JAVA_NATIVE_INSTANCE->date());
+    MC_POOL_END;
+    return result;
 }
 
 JNIEXPORT void JNICALL Java_com_libmailcore_MessageHeader_setDate
   (JNIEnv * env, jobject obj, jobject date)
 {
+    MC_POOL_BEGIN;
     MC_JAVA_NATIVE_INSTANCE->setDate(javaDateToTime(env, date));
+    MC_POOL_END;
 }
 
 JNIEXPORT jobject JNICALL Java_com_libmailcore_MessageHeader_receivedDate
   (JNIEnv * env, jobject obj)
 {
-    return timeToJavaDate(env, MC_JAVA_NATIVE_INSTANCE->receivedDate());
+    MC_POOL_BEGIN;
+    jobject result = timeToJavaDate(env, MC_JAVA_NATIVE_INSTANCE->receivedDate());
+    MC_POOL_END;
+    return result;
 }
 
 JNIEXPORT void JNICALL Java_com_libmailcore_MessageHeader_setReceivedDate
   (JNIEnv * env, jobject obj, jobject date)
 {
+    MC_POOL_BEGIN;
     MC_JAVA_NATIVE_INSTANCE->setReceivedDate(javaDateToTime(env, date));
+    MC_POOL_END;
 }
 
 MC_JAVA_SYNTHESIZE(Address, setSender, sender)
@@ -57,55 +70,79 @@ MC_JAVA_SYNTHESIZE_STRING(setUserAgent, userAgent)
 JNIEXPORT void JNICALL Java_com_libmailcore_MessageHeader_setExtraHeader
   (JNIEnv * env, jobject obj, jstring name, jstring value)
 {
+    MC_POOL_BEGIN;
     MC_JAVA_NATIVE_INSTANCE->setExtraHeader(MC_FROM_JAVA(String, name), MC_FROM_JAVA(String, value));
+    MC_POOL_END;
 }
 
 JNIEXPORT void JNICALL Java_com_libmailcore_MessageHeader_removeExtraHeader
   (JNIEnv * env, jobject obj, jstring name)
 {
+    MC_POOL_BEGIN;
     MC_JAVA_NATIVE_INSTANCE->removeExtraHeader(MC_FROM_JAVA(String, name));
+    MC_POOL_END;
 }
 
 JNIEXPORT jstring JNICALL Java_com_libmailcore_MessageHeader_extraHeaderValueForName
   (JNIEnv * env, jobject obj, jstring name)
 {
-    return (jstring) MC_TO_JAVA(MC_JAVA_NATIVE_INSTANCE->extraHeaderValueForName(MC_FROM_JAVA(String, name)));
+    MC_POOL_BEGIN;
+    jobject result = MC_TO_JAVA(MC_JAVA_NATIVE_INSTANCE->extraHeaderValueForName(MC_FROM_JAVA(String, name)));
+    MC_POOL_END;
+    return (jstring) result;
 }
 
 JNIEXPORT jobject JNICALL Java_com_libmailcore_MessageHeader_allExtraHeadersNames
   (JNIEnv * env, jobject obj)
 {
-    return MC_JAVA_BRIDGE_GET(allExtraHeadersNames);
+    MC_POOL_BEGIN;
+    jobject result = MC_JAVA_BRIDGE_GET(allExtraHeadersNames);
+    MC_POOL_END;
+    return result;
 }
 
 JNIEXPORT jstring JNICALL Java_com_libmailcore_MessageHeader_extractedSubject
   (JNIEnv * env, jobject obj)
 {
-    return (jstring) MC_JAVA_BRIDGE_GET(extractedSubject);
+    MC_POOL_BEGIN;
+    jstring result = MC_JAVA_BRIDGE_GET_STRING(extractedSubject);
+    MC_POOL_END;
+    return result;
 }
 
 JNIEXPORT jstring JNICALL Java_com_libmailcore_MessageHeader_partialExtractedSubject
   (JNIEnv * env, jobject obj)
 {
-    return (jstring) MC_JAVA_BRIDGE_GET(partialExtractedSubject);
+    MC_POOL_BEGIN;
+    jstring result = MC_JAVA_BRIDGE_GET_STRING(partialExtractedSubject);
+    MC_POOL_END;
+    return result;
 }
 
 JNIEXPORT void JNICALL Java_com_libmailcore_MessageHeader_importHeadersData
   (JNIEnv * env, jobject obj, jbyteArray data)
 {
+    MC_POOL_BEGIN;
     MC_JAVA_NATIVE_INSTANCE->importHeadersData(MC_FROM_JAVA(Data, data));
+    MC_POOL_END;
 }
 
 JNIEXPORT jobject JNICALL Java_com_libmailcore_MessageHeader_replyHeader
   (JNIEnv * env, jobject obj, jboolean replyAll, jobject excludedRecipients)
 {
-    return MC_TO_JAVA(MC_JAVA_NATIVE_INSTANCE->replyHeader(replyAll, MC_FROM_JAVA(Array, excludedRecipients)));
+    MC_POOL_BEGIN;
+    jobject result = MC_TO_JAVA(MC_JAVA_NATIVE_INSTANCE->replyHeader(replyAll, MC_FROM_JAVA(Array, excludedRecipients)));
+    MC_POOL_END;
+    return result;
 }
 
 JNIEXPORT jobject JNICALL Java_com_libmailcore_MessageHeader_forwardHeader
   (JNIEnv * env, jobject obj)
 {
-    return (jstring) MC_JAVA_BRIDGE_GET(forwardHeader);
+    MC_POOL_BEGIN;
+    jobject result = MC_JAVA_BRIDGE_GET(forwardHeader);
+    MC_POOL_END;
+    return result;
 }
 
 MC_JAVA_BRIDGE