diff --git a/src/fileio.c b/src/fileio.c
index 1f95d0e..5e3141e 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -6963,9 +6963,13 @@
 	    {
 		au_remove_pat(ap);
 		if (p_verbose >= 6)
+		{
+		    verbose_enter();
 		    smsg((char_u *)
 			    _("auto-removing autocommand: %s <buffer=%d>"),
 					   event_nr2name(event), buf->b_fnum);
+		    verbose_leave();
+		}
 	    }
     au_cleanup();
 }
@@ -8342,7 +8346,11 @@
 		    sprintf((char *)sourcing_name, s,
 					       (char *)name, (char *)ap->pat);
 		    if (p_verbose >= 8)
+		    {
+			verbose_enter();
 			smsg((char_u *)_("Executing %s"), sourcing_name);
+			verbose_leave();
+		    }
 		}
 
 		apc->curpat = ap;
@@ -8409,10 +8417,10 @@
 
     if (p_verbose >= 9)
     {
-	msg_scroll = TRUE;	    /* always scroll up, don't overwrite */
+	verbose_enter_scroll();
 	smsg((char_u *)_("autocommand %s"), ac->cmd);
 	msg_puts((char_u *)"\n");   /* don't overwrite this either */
-	cmdline_row = msg_row;
+	verbose_leave_scroll();
     }
     retval = vim_strsave(ac->cmd);
     autocmd_nested = ac->nested;