diff --git a/mailnews/db/gloda/modules/fundattr.js b/mailnews/db/gloda/modules/fundattr.js
index 4fce49025e..2a98786582 100644
--- a/mailnews/db/gloda/modules/fundattr.js
+++ b/mailnews/db/gloda/modules/fundattr.js
@@ -657,11 +657,14 @@ var GlodaFundAttr = {
 
     // Content
     if (aRawReps.bodyLines) {
-      aGlodaMessage._content = new GlodaContent();
+      aGlodaMessage._content = aRawReps.content = new GlodaContent();
       if (this.contentWhittle({}, aRawReps.bodyLines, aGlodaMessage._content)) {
         // we were going to do something here?
       }
     }
+    else {
+      aRawReps.content = null;
+    }
 
     yield Gloda.kWorkDone;
   },