diff --git a/include/class.thread.php b/include/class.thread.php
index f0f6b1c78a7dad1d7c6e525dbe583921e10021fe..fec7c52c40d9284a18ef3f4a6fca9191db3a0713 100644
--- a/include/class.thread.php
+++ b/include/class.thread.php
@@ -873,7 +873,9 @@ Class ThreadEntry {
                 $vars['body'] = new TextThreadBody($vars['body']);
         }
 
-        $body = Format::sanitize((string) $vars['body']->convertTo('html'));
+        if (!($body = Format::sanitize(
+                        (string) $vars['body']->convertTo('html'))))
+            $body = '-'; //Special tag used to signify empty message as stored.
 
         $poster = $vars['poster'];
         if ($poster && is_object($poster))