diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 58905f0..8cbec38 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -1056,11 +1056,14 @@
 	if (p_verbose >= 15 && sourcing_name != NULL)
 	{
 	    ++no_wait_return;
-	    msg_scroll = TRUE;	    /* always scroll up, don't overwrite */
+	    verbose_enter_scroll();
+
 	    smsg((char_u *)_("line %ld: %s"),
 					   (long)sourcing_lnum, cmdline_copy);
-	    msg_puts((char_u *)"\n");   /* don't overwrite this either */
-	    cmdline_row = msg_row;
+	    if (msg_silent == 0)
+		msg_puts((char_u *)"\n");   /* don't overwrite this */
+
+	    verbose_leave_scroll();
 	    --no_wait_return;
 	}