diff --git a/include/class.thread.php b/include/class.thread.php
index d47e3113a420d3a21895a10ed680da53825ffd71..9a6be978cdb3619ecc906b7adcfa598fa5880d79 100644
--- a/include/class.thread.php
+++ b/include/class.thread.php
@@ -1411,9 +1411,9 @@ class TextThreadBody extends ThreadBody {
 }
 class HtmlThreadBody extends ThreadBody {
     function __construct($body, $options=array()) {
+        if ($options['strip-embedded'])
+            $body = $this->extractEmbeddedHtmlImages($body);
         parent::__construct($body, 'html', $options);
-        if ($this->options['strip-embedded'])
-            $this->body = $this->extractEmbeddedHtmlImages($this->body);
     }
 
     function extractEmbeddedHtmlImages($body) {