- Fix replying to message with html attachment (#1485676)

git-svn-id: https://svn.roundcube.net/trunk@2294 208e9e7b-5314-0410-a742-e7e81cd9613c

2 files changed, 2 insertions, 5 deletions

diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG
index d609edc47..825fbb2f0 100644
--- a/roundcubemail/CHANGELOG
+++ b/roundcubemail/CHANGELOG
@@ -4,6 +4,7 @@ CHANGELOG RoundCube Webmail
 2009/02/13 (alec)
 ----------
 - Fix multiple recipients input parsing (#1485733)
+- Fix replying to message with html attachment (#1485676)
 
 2009/02/10 (alec)
 ----------
diff --git a/roundcubemail/program/include/rcube_message.php b/roundcubemail/program/include/rcube_message.php
index 513cb4c07..ec3be4b00 100644
--- a/roundcubemail/program/include/rcube_message.php
+++ b/roundcubemail/program/include/rcube_message.php
@@ -166,17 +166,13 @@ class rcube_message
    */
   function first_html_part()
     {
-    $html_part = null;
-
     // check all message parts
     foreach ($this->mime_parts as $mime_id => $part) {
       $mimetype = strtolower($part->ctype_primary . '/' . $part->ctype_secondary);
       if ($mimetype == 'text/html') {
-        $html_part = $this->imap->get_message_part($this->uid, $mime_id, $part);
+        return $this->imap->get_message_part($this->uid, $mime_id, $part);
       }
     }
-
-    return $html_part;
   }