Only abbreviate attachment file names in MSIE < 7

2 files changed, 7 insertions, 1 deletions

diff --git a/CHANGELOG b/CHANGELOG
index d15f6c951..d655fb2d3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,12 @@
 CHANGELOG RoundCube Webmail
 ---------------------------
 
+2008/12/18 (thomasb)
+----------
+- Only abbreviate attachment file names in MSIE < 7
+- Fix autocomplete "unknown server error" (#1485637)
+- Optimize autocomplete search and output
+
 2008/12/18 (alec)
 ----------
 - Fix STARTTLS before AUTH in SMTP connection (#1484883)
diff --git a/program/steps/mail/get.inc b/program/steps/mail/get.inc
index 9d696746a..b77621b0f 100644
--- a/program/steps/mail/get.inc
+++ b/program/steps/mail/get.inc
@@ -89,7 +89,7 @@ else if ($pid = get_input_value('_part', RCUBE_INPUT_GET)) {
       }
       
       $filename = $part->filename ? $part->filename : ($MESSAGE->subject ? $MESSAGE->subject : 'roundcube') . '.'.$ctype_secondary;
-      $filename = $browser->ie ? rawurlencode(abbreviate_string($filename, 55)) : addcslashes($filename, '"');
+      $filename = ($browser->ie && $browser->ver < 7) ? rawurlencode(abbreviate_string($filename, 55)) : addcslashes($filename, '"');
       $disposition = !empty($_GET['_download']) ? 'attachment' : 'inline';
       
       header("Content-Disposition: $disposition; filename=\"$filename\"");