diff --git a/include/class.mailfetch.php b/include/class.mailfetch.php
index d4d2029cb9a504b88fd525590f8d770ded296ce5..c85815138f854cc28eb07bdc1b1bf04384c1a77a 100644
--- a/include/class.mailfetch.php
+++ b/include/class.mailfetch.php
@@ -531,7 +531,7 @@ class MailFetcher {
                     if ($body = $this->getPart(
                         $mid, 'text/plain', $this->charset, $struct, false, 3, false
                     )) {
-                        return new TextThreadBody($body);
+                        return new TextThreadEntryBody($body);
                     }
                 }
             }
diff --git a/include/class.mailparse.php b/include/class.mailparse.php
index 083e3b26c92818128b3ea8913a0cd267b64f31a8..8d0f237fd4127fc8210fb3432d935a1ed1b0b44d 100644
--- a/include/class.mailparse.php
+++ b/include/class.mailparse.php
@@ -279,7 +279,7 @@ class Mail_Parse {
             && $this->struct->ctype_parameters['report-type'] == 'delivery-status'
         ) {
             if ($body = $this->getPart($this->struct, 'text/plain', 3, false))
-                return new TextThreadBody($body);
+                return new TextThreadEntryBody($body);
         }
         return false;
     }
diff --git a/include/class.ticket.php b/include/class.ticket.php
index 4d252dcf79ed57e133c065898bb2fb9ce7d2ba43..9eb714dc45235412d33b1a2ccbd3a07e203077ea 100644
--- a/include/class.ticket.php
+++ b/include/class.ticket.php
@@ -3289,7 +3289,7 @@ implements RestrictedAccess, Threadable {
         // Not assigned...save optional note if any
         if (!$vars['assignId'] && $vars['note']) {
             if (!$cfg->isRichTextEnabled()) {
-                $vars['note'] = new TextThreadBody($vars['note']);
+                $vars['note'] = new TextThreadEntryBody($vars['note']);
             }
             $ticket->logNote(_S('New Ticket'), $vars['note'], $thisstaff, false);
         }