1 files changed, 20 insertions, 5 deletions
diff --git a/src/java/native/com_libmailcore_AbstractMessage.cpp b/src/java/native/com_libmailcore_AbstractMessage.cpp
index ceec521a..19fa4e64 100644
--- a/src/java/native/com_libmailcore_AbstractMessage.cpp
+++ b/src/java/native/com_libmailcore_AbstractMessage.cpp
@@ -16,29 +16,44 @@ MC_JAVA_SYNTHESIZE(MessageHeader, setHeader, header)
 JNIEXPORT jobject JNICALL Java_com_libmailcore_AbstractMessage_partForContentID
   (JNIEnv * env, jobject obj, jstring contentID)
 {
-    return MC_TO_JAVA(MC_JAVA_NATIVE_INSTANCE->partForContentID(MC_FROM_JAVA(String, contentID)));
+    MC_POOL_BEGIN;
+    jobject result = MC_TO_JAVA(MC_JAVA_NATIVE_INSTANCE->partForContentID(MC_FROM_JAVA(String, contentID)));
+    MC_POOL_END;
+    return result;
 }
 
 JNIEXPORT jobject JNICALL Java_com_libmailcore_AbstractMessage_partForUniqueID
   (JNIEnv * env, jobject obj, jstring uniqueID)
 {
-    return MC_TO_JAVA(MC_JAVA_NATIVE_INSTANCE->partForUniqueID(MC_FROM_JAVA(String, uniqueID)));
+    MC_POOL_BEGIN;
+    jobject result = MC_TO_JAVA(MC_JAVA_NATIVE_INSTANCE->partForUniqueID(MC_FROM_JAVA(String, uniqueID)));
+    MC_POOL_END;
+    return result;
 }
 
 JNIEXPORT jobject JNICALL Java_com_libmailcore_AbstractMessage_attachments
   (JNIEnv * env, jobject obj)
 {
-    return MC_JAVA_BRIDGE_GET(attachments);
+    MC_POOL_BEGIN;
+    jobject result = MC_JAVA_BRIDGE_GET(attachments);
+    MC_POOL_END;
+    return result;
 }
 
 JNIEXPORT jobject JNICALL Java_com_libmailcore_AbstractMessage_htmlInlineAttachments
   (JNIEnv * env, jobject obj)
 {
-    return MC_JAVA_BRIDGE_GET(htmlInlineAttachments);
+    MC_POOL_BEGIN;
+    jobject result = MC_JAVA_BRIDGE_GET(htmlInlineAttachments);
+    MC_POOL_END;
+    return result;
 }
 
 JNIEXPORT jobject JNICALL Java_com_libmailcore_AbstractMessage_requiredPartsForRendering
   (JNIEnv * env, jobject obj)
 {
-    return MC_JAVA_BRIDGE_GET(requiredPartsForRendering);
+    MC_POOL_BEGIN;
+    jobject result = MC_JAVA_BRIDGE_GET(requiredPartsForRendering);
+    MC_POOL_END;
+    return result;
 }