1 files changed, 4 insertions, 0 deletions
diff --git a/program/js/app.js b/program/js/app.js
index 7764c6c86..0f5a60c6f 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -3413,6 +3413,10 @@ function rcube_webmail()
             message = message.substring(0, p) + sig + message.substring(p, message.length);
             cursor_pos = p - 1;
           }
+          else if (!message) { // empty message
+            cursor_pos = 0;
+            message = '\n\n' + sig;
+          }
           else if (pos = this.get_caret_pos(input_message.get(0))) { // at cursor position
             message = message.substring(0, pos) + '\n' + sig + '\n\n' + message.substring(pos, message.length);
             cursor_pos = pos;