diff --git a/program/js/app.js b/program/js/app.js
index 17b9b301c..bbb33570e 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -4585,7 +4585,7 @@ function rcube_webmail()
         return false;
       }
       if (!name)
-        name = text.substring(0,40);
+        name = text.replace(/[\r\n]+/g, ' ').substring(0,40);
 
       var lock = ref.display_message(ref.get_label('savingresponse'), 'loading');
       ref.http_post('settings/responses', { _insert:1, _name:name, _text:text }, lock);