1 files changed, 14 insertions, 2 deletions
diff --git a/src/core/renderer/MCMessageRendererHelper.cpp b/src/core/renderer/MCMessageRendererHelper.cpp
index 81e9e38a..bd4a1745 100644
--- a/src/core/renderer/MCMessageRendererHelper.cpp
+++ b/src/core/renderer/MCMessageRendererHelper.cpp
@@ -10,12 +10,24 @@
 
 using namespace mailcore;
 
+MessageRendererHelper::MessageRendererHelper()
+{
+    mDataCallback = new HTMLRendererIMAPCallback();
+    mHtmlCallback = new HTMLBodyRendererTemplateCallback();
+}
+
+MessageRendererHelper::~MessageRendererHelper()
+{
+    MC_SAFE_RELEASE(mDataCallback);
+    MC_SAFE_RELEASE(mHtmlCallback);
+}
+
 HTMLRendererIMAPCallback * MessageRendererHelper::dataCallback()
 {
-    return new HTMLRendererIMAPCallback();
+    return mDataCallback;
 }
 
 HTMLBodyRendererTemplateCallback * MessageRendererHelper::htmlBodyCallback()
 {
-    return new HTMLBodyRendererTemplateCallback();
+    return mHtmlCallback;
 }