diff --git a/include/class.forms.php b/include/class.forms.php
index a73b4e90dd42892592cb93362ac014f3faa47fb2..586309465e36e57ed89166b0758e382cd199b8bb 100644
--- a/include/class.forms.php
+++ b/include/class.forms.php
@@ -1248,7 +1248,7 @@ class ThreadEntryWidget extends Widget {
             && !$cfg->allowAttachmentsOnlogin())
             || ($cfg->allowAttachmentsOnlogin()
                 && ($thisclient && $thisclient->isValid()))) { ?>
-        <div class="clear"><div>
+        <div class="clear"></div>
         <hr/>
         <div><strong style="padding-right:1em;vertical-align:top">Attachments: </strong>
         <div style="display:inline-block">
diff --git a/include/class.mailer.php b/include/class.mailer.php
index 50561652f1e11fbc5c9b58b7a831a95244df422b..f037e083cc8ee56f4ba1b343396e9abc79903cae 100644
--- a/include/class.mailer.php
+++ b/include/class.mailer.php
@@ -39,7 +39,7 @@ class Mailer {
             if(!$e->allowSpoofing() || !$email)
                 $email = $e;
         } elseif(!$email && $cfg && ($e=$cfg->getDefaultEmail())) {
-            if($e->isSMTPEnabled() && ($info=$email->getSMTPInfo()))
+            if($e->isSMTPEnabled() && ($info=$e->getSMTPInfo()))
                 $this->smtp = $info;
             $email = $e;
         }
diff --git a/include/class.mailparse.php b/include/class.mailparse.php
index 703258b5632f4e835d21c1a7368e70042c76987f..22bb6ad418997c8a55d5810d9db78d811bde7ad1 100644
--- a/include/class.mailparse.php
+++ b/include/class.mailparse.php
@@ -275,7 +275,8 @@ class Mail_Parse {
                 return $p->parts[0]->headers;
             // Handle rfc1892 style bounces
             if (strtolower($ctype) === 'text/rfc822-headers') {
-                $T = new Mail_mimeDecode($p->body . "\n\nIgnored");
+                $body = $p->body . "\n\nIgnored";
+                $T = new Mail_mimeDecode($body);
                 if ($struct = $T->decode())
                     return $struct->headers;
             }
diff --git a/include/class.thread.php b/include/class.thread.php
index cd3f8f9cda40f96de1bf6fb3002b9af8591e93d1..8d468d9595cd1bffb5563963c4545a2b85637cc2 100644
--- a/include/class.thread.php
+++ b/include/class.thread.php
@@ -1066,7 +1066,8 @@ Class ThreadEntry {
                 // content-id will be discarded, only the unique hash-code
                 // will be available to retrieve the image later
                 if ($a['cid'] && $a['key']) {
-                    $body = preg_replace('/src=("|\'|\b)(?:cid:)?'.$a['cid'].'\1/i',
+                    $body = preg_replace('/src=("|\'|\b)(?:cid:)?'
+                        . preg_quote($a['cid'], '/').'\1/i',
                         'src="cid:'.$a['key'].'"', $body);
                 }
             }