diff --git a/program/include/main.inc b/program/include/main.inc
index 6fe3a29ff..1e25dd6d1 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -1712,7 +1712,7 @@ function rcmail_render_folder_tree_html(&$arrFolders, &$mbox_name, $maxlength, $
       // shorten the folder name to a given length
       if ($maxlength && $maxlength>1)
         {
-        $fname = abbrevate_string($foldername, $maxlength);
+        $fname = abbreviate_string($foldername, $maxlength);
         if ($fname != $foldername)
           $title = ' title="'.Q($foldername).'"';
         $foldername = $fname;
@@ -1791,7 +1791,7 @@ function rcmail_render_folder_tree_select(&$arrFolders, &$mbox_name, $maxlength,
       
       // shorten the folder name to a given length
       if ($maxlength && $maxlength>1)
-        $foldername = abbrevate_string($foldername, $maxlength);
+        $foldername = abbreviate_string($foldername, $maxlength);
       }
 
     $out .= sprintf('<option value="%s">%s%s</option>'."\n",
diff --git a/program/include/rcube_shared.inc b/program/include/rcube_shared.inc
index 05fa7a2bc..0c336ca4e 100644
--- a/program/include/rcube_shared.inc
+++ b/program/include/rcube_shared.inc
@@ -557,9 +557,9 @@ function rc_request_header($name)
  * @param string Input string
  * @param int    Max. length
  * @param string Replace removed chars with this
- * @return string Abbrevated string
+ * @return string Abbreviated string
  */
-function abbrevate_string($str, $maxlength, $place_holder='...')
+function abbreviate_string($str, $maxlength, $place_holder='...')
 {
   $length = rc_strlen($str);
   $first_part_length = floor($maxlength/2) - rc_strlen($place_holder);
diff --git a/program/steps/mail/get.inc b/program/steps/mail/get.inc
index dad49d370..6aca13101 100644
--- a/program/steps/mail/get.inc
+++ b/program/steps/mail/get.inc
@@ -108,7 +108,7 @@ else if ($pid = get_input_value('_part', RCUBE_INPUT_GET))
       {
       header(sprintf('Content-Disposition: %s; filename="%s";',
                      $_GET['_download'] ? 'attachment' : 'inline',
-                     $part->filename ? $part->filename : "roundcube.$ctype_secondary"));
+                     $part->filename ? abbreviate_string($part->filename, 55) : "roundcube.$ctype_secondary"));
 
       // turn off output buffering and print part content
       $IMAP->get_message_part($MESSAGE['UID'], $part->mime_id, $part, true);