diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 01518ff..9630252 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -1011,6 +1011,7 @@
     if (addr_count == 0)		// :!
     {
 	// echo the command
+	dont_use_message_window();
 	msg_start();
 	msg_putchar(':');
 	msg_putchar('!');
diff --git a/src/message.c b/src/message.c
index e4f8af1..5c5e378 100644
--- a/src/message.c
+++ b/src/message.c
@@ -1472,7 +1472,7 @@
     }
 
 #ifdef FEAT_EVAL
-    if (need_clr_eos || p_ch == 0)
+    if (need_clr_eos || use_message_window())
     {
 	// Halfway an ":echo" command and getting an (error) message: clear
 	// any text from the command.
@@ -1508,8 +1508,9 @@
 #endif
 	    0;
     }
-    else if (msg_didout || p_ch == 0)	    // start message on next line
+    else if (msg_didout || use_message_window())
     {
+	// start message on next line
 	msg_putchar('\n');
 	did_return = TRUE;
 	if (exmode_active != EXMODE_NORMAL)
diff --git a/src/version.c b/src/version.c
index b1eb73f..82b43be 100644
--- a/src/version.c
+++ b/src/version.c
@@ -708,6 +708,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    315,
+/**/
     314,
 /**/
     313,