diff --git a/include/class.mailer.php b/include/class.mailer.php
index 029051a9e67b9cf465d6cbe0596bf65418cf618b..5cd4dfc4b239a0ea31e3cac436ab8fa570f9201a 100644
--- a/include/class.mailer.php
+++ b/include/class.mailer.php
@@ -440,6 +440,9 @@ class Mailer {
                             break;
                         }
                     }
+                    if (!$file)
+                        // Not attached yet attempt to attach it inline
+                        $file = AttachmentFile::lookup($match[1]);
                     if (!$file)
                         return $match[0];
                     $mime->addHTMLImage($file->getData(),
diff --git a/include/class.thread.php b/include/class.thread.php
index c3649b280f4ed3c4b1677704a97baa479b434e1e..c3d58f3b9f56783ef491e18ed35c91bf013a61ba 100644
--- a/include/class.thread.php
+++ b/include/class.thread.php
@@ -616,7 +616,6 @@ implements TemplateVariable {
     var $_headers;
     var $_thread;
     var $_actions;
-    var $_attachments;
 
     static protected $perms = array(
         self::PERM_EDIT => array(