diff --git a/CHANGELOG b/CHANGELOG
index 76f20adc7..8f3463236 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,14 @@
 CHANGELOG RoundCube Webmail
 ---------------------------
 
+2008/08/21 (alec)
+----------
+- Add Content-Length header while attachments downloading (#1484256)
+- Fix In-Reply-To and References headers when composing saved draft 
+  message (#1485288)
+- Removed PHP4 class constructors
+- Fix html message charset conversion for charsets with underline (#1485287) 
+
 2008/08/21 (estadtherr)
 ----------
 - Fix escaping of To: and From: fields when building message body for reply
diff --git a/program/steps/mail/get.inc b/program/steps/mail/get.inc
index 842c60536..22658346e 100644
--- a/program/steps/mail/get.inc
+++ b/program/steps/mail/get.inc
@@ -100,6 +100,7 @@ else if ($pid = get_input_value('_part', RCUBE_INPUT_GET)) {
       $OUTPUT->write(rcmail_print_body($part, array('safe' => $MESSAGE->is_safe, 'inline_html' => false)));
     }
     else {
+      header(sprintf('Content-Length: %d', $part->size));
       header(sprintf('Content-Disposition: %s; filename="%s";',
                      $_GET['_download'] ? 'attachment' : 'inline',
                      $part->filename ? abbreviate_string($part->filename, 55) : "roundcube.$ctype_secondary"));