diff --git a/program/steps/mail/get.inc b/program/steps/mail/get.inc
index 19be4bd07..f698e38dd 100644
--- a/program/steps/mail/get.inc
+++ b/program/steps/mail/get.inc
@@ -151,11 +151,10 @@ else if (strlen($pid = get_input_value('_part', RCUBE_INPUT_GET))) {
         $filename = rcube_label('htmlmessage');
       }
       else {
-        $filename = ($MESSAGE->subject ? $MESSAGE->subject : 'roundcube');
+        $ext = '.' . ($mimetype == 'text/plain' ? 'txt' : $ctype_secondary);
+        $filename = ($MESSAGE->subject ? $MESSAGE->subject : 'roundcube') . $ext;
       }
 
-      $ext      = '.' . ($mimetype == 'text/plain' ? 'txt' : $ctype_secondary);
-      $filename .= $ext;
       $filename = preg_replace('[\r\n]', '', $filename);
 
       if ($browser->ie && $browser->ver < 7)