diff --git a/CHANGELOG b/CHANGELOG
index 997c235dc..02889bdda 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,7 @@ CHANGELOG RoundCube Webmail
 - Switch to/from when searcing in Sent folder (#1484555)
 - Correctly read the References header (#1484646)
 - Unset old cookie in before sending a new value (#1484639)
+- Correctly decode attachments when downloading them (#1484645 and #1484642)
 
 2007/10/22 (tomekp)
 ----------
diff --git a/program/include/rcube_imap.inc b/program/include/rcube_imap.inc
index a5258279c..4071dbb21 100644
--- a/program/include/rcube_imap.inc
+++ b/program/include/rcube_imap.inc
@@ -1201,15 +1201,22 @@ class rcube_imap
 
     if ($print)
       {
-      iil_C_HandlePartBody($this->conn, $this->mailbox, $msg_id, $part, ($o_part->encoding=='base64'?3:2));
-      $body = TRUE;
+      $mode = $o_part->encoding == 'base64' ? 3 : ($o_part->encoding == 'quoted-printable' ? 1 : 2);
+      $body = iil_C_HandlePartBody($this->conn, $this->mailbox, $msg_id, $part, $mode);
+      
+      // we have to decode the part manually before printing
+      if ($mode == 1)
+        {
+        echo $this->mime_decode($body, $o_part->encoding);
+        $body = true;
+        }
       }
     else
       {
       $body = iil_C_HandlePartBody($this->conn, $this->mailbox, $msg_id, $part, 1);
 
       // decode part body
-      if ($o_part->encoding=='base64' || $o_part->encoding=='quoted-printable')
+      if ($o_part->encoding)
         $body = $this->mime_decode($body, $o_part->encoding);
 
       // convert charset (if text or message part)
diff --git a/program/steps/mail/get.inc b/program/steps/mail/get.inc
index 880baa38b..c9e40ac77 100644
--- a/program/steps/mail/get.inc
+++ b/program/steps/mail/get.inc
@@ -111,7 +111,7 @@ else if ($pid = get_input_value('_part', RCUBE_INPUT_GET))
                      $part->filename ? $part->filename : "roundcube.$ctype_secondary"));
 
       // turn off output buffering and print part content
-      $IMAP->get_message_part($MESSAGE['UID'], $part->mime_id, $part->encoding, true);
+      $IMAP->get_message_part($MESSAGE['UID'], $part->mime_id, $part, true);
       }
 
     exit;