diff --git a/src/nvim/message.c b/src/nvim/message.c
index f5ede4a8a1..a4f862ec3c 100644
--- a/src/nvim/message.c
+++ b/src/nvim/message.c
@@ -3478,7 +3478,7 @@ void verbose_enter(void)
   if (*p_vfile != NUL) {
     msg_silent++;
   }
-  // last_set_msg unsets p_verbose to avoid setting the verbose kind.
+  // Don't set the verbose kind if message continuity is wanted like with last_set_msg().
   if (!msg_ext_skip_verbose) {
     if (msg_ext_kind != verbose_kind) {
       pre_verbose_kind = msg_ext_kind;
diff --git a/src/nvim/os/shell.c b/src/nvim/os/shell.c
index 04e072908b..a943f82ce2 100644
--- a/src/nvim/os/shell.c
+++ b/src/nvim/os/shell.c
@@ -700,9 +700,11 @@ int os_call_shell(char *cmd, int opts, char *extra_args)
 
   if (!emsg_silent && exitcode != 0 && !(opts & kShellOptSilent)) {
     msg_ext_set_kind("shell_ret");
-    msg_puts(_("\nshell returned "));
+    if (!ui_has(kUIMessages)) {
+      msg_putchar('\n');
+    }
+    msg_puts(_("shell returned "));
     msg_outnum(exitcode);
-    msg_putchar('\n');
   }
 
   State = current_state;
@@ -1120,6 +1122,7 @@ static void out_data_append_to_screen(const char *output, size_t *count, int fd,
   const char *p = output;
   const char *end = output + *count;
   msg_ext_set_kind(fd == STDERR_FILENO ? "shell_err" : "shell_out");
+  msg_ext_append = true;
   while (p < end) {
     if (*p == '\n' || *p == '\r' || *p == TAB || *p == BELL) {
       msg_putchar_hl((uint8_t)(*p), fd == STDERR_FILENO ? HLF_SE : HLF_SO);
diff --git a/src/nvim/po/af.po b/src/nvim/po/af.po
index 38faefb1dd..81f09f320c 100644
--- a/src/nvim/po/af.po
+++ b/src/nvim/po/af.po
@@ -4110,12 +4110,8 @@ msgstr "E358: 'langmap: Ekstra karakters na kommapunt: %s"
 msgid "Vim: Error reading input, exiting...\n"
 msgstr "Vim: Fout met lees van invoer, verlaat...\n"
 
-msgid ""
-"\n"
-"shell returned "
-msgstr ""
-"\n"
-"dop lewer "
+msgid "shell returned "
+msgstr "dop lewer "
 
 #~ msgid ""
 #~ "\n"
diff --git a/src/nvim/po/ca.po b/src/nvim/po/ca.po
index 3c3737e76f..a0211348f5 100644
--- a/src/nvim/po/ca.po
+++ b/src/nvim/po/ca.po
@@ -4667,12 +4667,8 @@ msgstr ""
 "No s'ha pogut executar la shell "
 
 #: ../os/shell.c:439
-msgid ""
-"\n"
-"shell returned "
-msgstr ""
-"\n"
-"la shell ha retornat "
+msgid "shell returned "
+msgstr "la shell ha retornat "
 
 #: ../os_unix.c:465 ../os_unix.c:471
 msgid ""
diff --git a/src/nvim/po/cs.cp1250.po b/src/nvim/po/cs.cp1250.po
index 2f6e72bc44..03a30fb634 100644
--- a/src/nvim/po/cs.cp1250.po
+++ b/src/nvim/po/cs.cp1250.po
@@ -4747,12 +4747,8 @@ msgstr ""
 "nelze spustit shell "
 
 #: ../os/shell.c:439
-msgid ""
-"\n"
-"shell returned "
-msgstr ""
-"\n"
-" návratová hodnota shellu "
+msgid "shell returned "
+msgstr " návratová hodnota shellu "
 
 #: ../os_unix.c:465 ../os_unix.c:471
 msgid ""
diff --git a/src/nvim/po/cs.po b/src/nvim/po/cs.po
index f6b062de70..3e598cbb3d 100644
--- a/src/nvim/po/cs.po
+++ b/src/nvim/po/cs.po
@@ -4747,12 +4747,8 @@ msgstr ""
 "nelze spustit shell "
 
 #: ../os/shell.c:439
-msgid ""
-"\n"
-"shell returned "
-msgstr ""
-"\n"
-" návratová hodnota shellu "
+msgid "shell returned "
+msgstr " návratová hodnota shellu "
 
 #: ../os_unix.c:465 ../os_unix.c:471
 msgid ""
diff --git a/src/nvim/po/da.po b/src/nvim/po/da.po
index 1e6e6b354a..933ccd10c2 100644
--- a/src/nvim/po/da.po
+++ b/src/nvim/po/da.po
@@ -4430,12 +4430,8 @@ msgstr ""
 "\n"
 "Kan ikke udføre skallen sh\n"
 
-msgid ""
-"\n"
-"shell returned "
-msgstr ""
-"\n"
-"skal returnerede "
+msgid "shell returned "
+msgstr "skal returnerede "
 
 msgid ""
 "\n"
diff --git a/src/nvim/po/de.po b/src/nvim/po/de.po
index fdca801ab1..252d9850d3 100644
--- a/src/nvim/po/de.po
+++ b/src/nvim/po/de.po
@@ -53,12 +53,8 @@ msgstr ""
 "Shell kann nicht ausführt werden "
 
 #: ../os/shell.c:450
-msgid ""
-"\n"
-"shell returned "
-msgstr ""
-"\n"
-"Shell beendet "
+msgid "shell returned "
+msgstr "Shell beendet "
 
 #: ../buffer.c:88
 msgid "[Location List]"
diff --git a/src/nvim/po/en_GB.po b/src/nvim/po/en_GB.po
index 9c786d106f..9bba6ff2a7 100644
--- a/src/nvim/po/en_GB.po
+++ b/src/nvim/po/en_GB.po
@@ -4445,9 +4445,7 @@ msgid ""
 msgstr ""
 
 #: ../os/shell.c:439
-msgid ""
-"\n"
-"shell returned "
+msgid "shell returned "
 msgstr ""
 
 #: ../os_unix.c:465 ../os_unix.c:471
diff --git a/src/nvim/po/eo.po b/src/nvim/po/eo.po
index d46af684a0..145edfbc61 100644
--- a/src/nvim/po/eo.po
+++ b/src/nvim/po/eo.po
@@ -4184,12 +4184,8 @@ msgstr ""
 "\n"
 "Ne eblas plenumi �elon sh\n"
 
-msgid ""
-"\n"
-"shell returned "
-msgstr ""
-"\n"
-"�elo liveris "
+msgid "shell returned "
+msgstr "�elo liveris "
 
 msgid ""
 "\n"
diff --git a/src/nvim/po/es.po b/src/nvim/po/es.po
index 4990558546..2a8ce1413d 100644
--- a/src/nvim/po/es.po
+++ b/src/nvim/po/es.po
@@ -4728,12 +4728,8 @@ msgstr ""
 "No se pudo ejecutar el intérprete de órdenes "
 
 #: ../os/shell.c:439
-msgid ""
-"\n"
-"shell returned "
-msgstr ""
-"\n"
-"El intérprete de órdenes devolvió "
+msgid "shell returned "
+msgstr "El intérprete de órdenes devolvió "
 
 #: ../os_unix.c:465 ../os_unix.c:471
 msgid ""
diff --git a/src/nvim/po/fi.po b/src/nvim/po/fi.po
index 5ff05353c9..01f02de0f1 100644
--- a/src/nvim/po/fi.po
+++ b/src/nvim/po/fi.po
@@ -4178,12 +4178,8 @@ msgstr "dlerror = %s"
 msgid "Vim: Error reading input, exiting...\n"
 msgstr "Vim: Virhe luettaessa syötettä, poistutaan...\n"
 
-msgid ""
-"\n"
-"shell returned "
-msgstr ""
-"\n"
-"kuoren palautusarvo "
+msgid "shell returned "
+msgstr "kuoren palautusarvo "
 
 #~ msgid ""
 #~ "\n"
diff --git a/src/nvim/po/fr.po b/src/nvim/po/fr.po
index 13bbb4fada..e010498184 100644
--- a/src/nvim/po/fr.po
+++ b/src/nvim/po/fr.po
@@ -3921,12 +3921,8 @@ msgstr ""
 "\n"
 "Impossible d'exécuter le shell sh\n"
 
-msgid ""
-"\n"
-"shell returned "
-msgstr ""
-"\n"
-"le shell a retourné "
+msgid "shell returned "
+msgstr "le shell a retourné "
 
 msgid ""
 "\n"
diff --git a/src/nvim/po/ga.po b/src/nvim/po/ga.po
index 2d4635fbc6..82b905dbb4 100644
--- a/src/nvim/po/ga.po
+++ b/src/nvim/po/ga.po
@@ -4476,12 +4476,8 @@ msgstr ""
 "\n"
 "Ní féidir an bhlaosc sh a rith\n"
 
-msgid ""
-"\n"
-"shell returned "
-msgstr ""
-"\n"
-"d'aisfhill an bhlaosc "
+msgid "shell returned "
+msgstr "d'aisfhill an bhlaosc "
 
 msgid ""
 "\n"
diff --git a/src/nvim/po/it.po b/src/nvim/po/it.po
index 6b3c87cd3d..8f6ebaf8fe 100644
--- a/src/nvim/po/it.po
+++ b/src/nvim/po/it.po
@@ -4698,12 +4698,8 @@ msgstr ""
 "Non riesco a eseguire shell "
 
 #: ../os/shell.c:439
-msgid ""
-"\n"
-"shell returned "
-msgstr ""
-"\n"
-"shell terminato con return-code "
+msgid "shell returned "
+msgstr "shell terminato con return-code "
 
 #: ../os_unix.c:465 ../os_unix.c:471
 msgid ""
diff --git a/src/nvim/po/ja.euc-jp.po b/src/nvim/po/ja.euc-jp.po
index dc7d30546c..9097737f3d 100644
--- a/src/nvim/po/ja.euc-jp.po
+++ b/src/nvim/po/ja.euc-jp.po
@@ -4194,12 +4194,8 @@ msgstr ""
 "\n"
 "sh ¥·¥§¥ë¤ò¼Â¹Ô¤Ç¤­¤Þ¤»¤ó\n"
 
-msgid ""
-"\n"
-"shell returned "
-msgstr ""
-"\n"
-"¥·¥§¥ë¤¬ÃͤòÊÖ¤·¤Þ¤·¤¿ "
+msgid "shell returned "
+msgstr "¥·¥§¥ë¤¬ÃͤòÊÖ¤·¤Þ¤·¤¿ "
 
 msgid ""
 "\n"
diff --git a/src/nvim/po/ja.po b/src/nvim/po/ja.po
index 04b13c4529..ea1582a4d0 100644
--- a/src/nvim/po/ja.po
+++ b/src/nvim/po/ja.po
@@ -5563,12 +5563,8 @@ msgstr "�在� %s言語: \"%s\""
 msgid "E197: Cannot set language to \"%s\""
 msgstr "E197: 言語を \"%s\" �設定����ん"
 
-msgid ""
-"\n"
-"shell returned "
-msgstr ""
-"\n"
-"シェル�値を返���� "
+msgid "shell returned "
+msgstr "シェル�値を返���� "
 
 msgid ""
 "\n"
diff --git a/src/nvim/po/ko.UTF-8.po b/src/nvim/po/ko.UTF-8.po
index cf59c321fb..8be9edf007 100644
--- a/src/nvim/po/ko.UTF-8.po
+++ b/src/nvim/po/ko.UTF-8.po
@@ -4602,12 +4602,8 @@ msgstr ""
 "Cannot execute shell "
 
 #: ../os/shell.c:439
-msgid ""
-"\n"
-"shell returned "
-msgstr ""
-"\n"
-"shell returned "
+msgid "shell returned "
+msgstr "shell returned "
 
 #: ../os_unix.c:465 ../os_unix.c:471
 msgid ""
diff --git a/src/nvim/po/nb.po b/src/nvim/po/nb.po
index 8d50a00f4d..922d500bbb 100644
--- a/src/nvim/po/nb.po
+++ b/src/nvim/po/nb.po
@@ -4626,12 +4626,8 @@ msgstr ""
 "Kan ikke kjøre skall "
 
 #: ../os/shell.c:439
-msgid ""
-"\n"
-"shell returned "
-msgstr ""
-"\n"
-"skallet returnerte "
+msgid "shell returned "
+msgstr "skallet returnerte "
 
 #: ../os_unix.c:465 ../os_unix.c:471
 msgid ""
diff --git a/src/nvim/po/nl.po b/src/nvim/po/nl.po
index 7609deae85..7d9b0edf6b 100644
--- a/src/nvim/po/nl.po
+++ b/src/nvim/po/nl.po
@@ -4622,9 +4622,7 @@ msgid ""
 msgstr ""
 
 #: ../os/shell.c:439
-msgid ""
-"\n"
-"shell returned "
+msgid "shell returned "
 msgstr ""
 
 #: ../os_unix.c:465 ../os_unix.c:471
diff --git a/src/nvim/po/no.po b/src/nvim/po/no.po
index 8d50a00f4d..922d500bbb 100644
--- a/src/nvim/po/no.po
+++ b/src/nvim/po/no.po
@@ -4626,12 +4626,8 @@ msgstr ""
 "Kan ikke kjøre skall "
 
 #: ../os/shell.c:439
-msgid ""
-"\n"
-"shell returned "
-msgstr ""
-"\n"
-"skallet returnerte "
+msgid "shell returned "
+msgstr "skallet returnerte "
 
 #: ../os_unix.c:465 ../os_unix.c:471
 msgid ""
diff --git a/src/nvim/po/pl.UTF-8.po b/src/nvim/po/pl.UTF-8.po
index e20a808d6e..c74a3317ba 100644
--- a/src/nvim/po/pl.UTF-8.po
+++ b/src/nvim/po/pl.UTF-8.po
@@ -4591,12 +4591,8 @@ msgstr ""
 "Nie mogę wykonać powłoki "
 
 #: ../os/shell.c:439
-msgid ""
-"\n"
-"shell returned "
-msgstr ""
-"\n"
-"powłoka zwróciła "
+msgid "shell returned "
+msgstr "powłoka zwróciła "
 
 #: ../os_unix.c:465 ../os_unix.c:471
 msgid ""
diff --git a/src/nvim/po/pt_BR.po b/src/nvim/po/pt_BR.po
index b19a52127b..09e18ec838 100644
--- a/src/nvim/po/pt_BR.po
+++ b/src/nvim/po/pt_BR.po
@@ -4780,12 +4780,8 @@ msgstr ""
 "Não foi possível executar o shell "
 
 #: ../os/shell.c:450
-msgid ""
-"\n"
-"shell returned "
-msgstr ""
-"\n"
-"o shell devolveu "
+msgid "shell returned "
+msgstr "o shell devolveu "
 
 #: ../mark.c:673
 msgid "No marks set"
diff --git a/src/nvim/po/ru.po b/src/nvim/po/ru.po
index fc38f94597..38326b4910 100644
--- a/src/nvim/po/ru.po
+++ b/src/nvim/po/ru.po
@@ -4641,12 +4641,8 @@ msgstr ""
 "�евозможно запу�тить оболочку "
 
 #: ../os/shell.c:439
-msgid ""
-"\n"
-"shell returned "
-msgstr ""
-"\n"
-"Оболочка завершила работу "
+msgid "shell returned "
+msgstr "Оболочка завершила работу "
 
 #: ../os_unix.c:465 ../os_unix.c:471
 msgid ""
diff --git a/src/nvim/po/sk.cp1250.po b/src/nvim/po/sk.cp1250.po
index 4a862abd31..06d0da179d 100644
--- a/src/nvim/po/sk.cp1250.po
+++ b/src/nvim/po/sk.cp1250.po
@@ -4631,12 +4631,8 @@ msgstr ""
 "Nedá sa spusti� shell "
 
 #: ../os/shell.c:439
-msgid ""
-"\n"
-"shell returned "
-msgstr ""
-"\n"
-" návratová hodnota shellu "
+msgid "shell returned "
+msgstr " návratová hodnota shellu "
 
 #: ../os_unix.c:465 ../os_unix.c:471
 msgid ""
diff --git a/src/nvim/po/sk.po b/src/nvim/po/sk.po
index 79ed3e9539..1e73510b92 100644
--- a/src/nvim/po/sk.po
+++ b/src/nvim/po/sk.po
@@ -4635,12 +4635,8 @@ msgstr ""
 "Nedá sa spusti» shell "
 
 #: ../os/shell.c:439
-msgid ""
-"\n"
-"shell returned "
-msgstr ""
-"\n"
-" návratová hodnota shellu "
+msgid "shell returned "
+msgstr " návratová hodnota shellu "
 
 #: ../os_unix.c:465 ../os_unix.c:471
 msgid ""
diff --git a/src/nvim/po/sr.po b/src/nvim/po/sr.po
index b4cc417650..72d5cedf19 100644
--- a/src/nvim/po/sr.po
+++ b/src/nvim/po/sr.po
@@ -4733,12 +4733,8 @@ msgstr ""
 "\n"
 "Командно окружење sh не може да �е изврши\n"
 
-msgid ""
-"\n"
-"shell returned "
-msgstr ""
-"\n"
-"командно окружење је вратило "
+msgid "shell returned "
+msgstr "командно окружење је вратило "
 
 msgid ""
 "\n"
diff --git a/src/nvim/po/sv.po b/src/nvim/po/sv.po
index 4672745aab..3e2ef7cf84 100644
--- a/src/nvim/po/sv.po
+++ b/src/nvim/po/sv.po
@@ -2637,12 +2637,8 @@ msgstr ""
 "\n"
 "Kan inte köra skal sh\n"
 
-msgid ""
-"\n"
-"shell returned "
-msgstr ""
-"\n"
-"skal returnerade "
+msgid "shell returned "
+msgstr "skal returnerade "
 
 msgid ""
 "\n"
diff --git a/src/nvim/po/tr.po b/src/nvim/po/tr.po
index 4503bfc4af..bf0280d925 100644
--- a/src/nvim/po/tr.po
+++ b/src/nvim/po/tr.po
@@ -4414,12 +4414,8 @@ msgstr "Åžu anki %sdil: \"%s\""
 msgid "E197: Cannot set language to \"%s\""
 msgstr "E197: \"%s\" diline ayarlanamıyor"
 
-msgid ""
-"\n"
-"shell returned "
-msgstr ""
-"\n"
-"Program çıktı: "
+msgid "shell returned "
+msgstr "Program çıktı: "
 
 msgid ""
 "\n"
diff --git a/src/nvim/po/uk.po b/src/nvim/po/uk.po
index 8dcbf189bd..72dc2b628f 100644
--- a/src/nvim/po/uk.po
+++ b/src/nvim/po/uk.po
@@ -4397,12 +4397,8 @@ msgstr "Мова (%s): «%s»"
 msgid "E197: Cannot set language to \"%s\""
 msgstr "E197: �е вдало�� в�тановити мову «%s»"
 
-msgid ""
-"\n"
-"shell returned "
-msgstr ""
-"\n"
-"оболонка повернула: "
+msgid "shell returned "
+msgstr "оболонка повернула: "
 
 msgid ""
 "\n"
diff --git a/src/nvim/po/vi.po b/src/nvim/po/vi.po
index acecdee093..d59fe2f30f 100644
--- a/src/nvim/po/vi.po
+++ b/src/nvim/po/vi.po
@@ -3756,12 +3756,8 @@ msgstr ""
 "\n"
 "Không chạy được shell sh\n"
 
-msgid ""
-"\n"
-"shell returned "
-msgstr ""
-"\n"
-"shell dừng làm việc "
+msgid "shell returned "
+msgstr "shell dừng làm việc "
 
 msgid ""
 "\n"
diff --git a/src/nvim/po/zh_CN.UTF-8.po b/src/nvim/po/zh_CN.UTF-8.po
index c5043c15c5..1edb516fae 100644
--- a/src/nvim/po/zh_CN.UTF-8.po
+++ b/src/nvim/po/zh_CN.UTF-8.po
@@ -5335,12 +5335,8 @@ msgid "Vim: Error reading input, exiting...\n"
 msgstr "Vim：读�输入时出错，正在退出……\n"
 
 #: ../os/shell.c:696
-msgid ""
-"\n"
-"shell returned "
-msgstr ""
-"\n"
-"Shell 返回了 "
+msgid "shell returned "
+msgstr "Shell 返回了 "
 
 #: ../os/shell.c:878
 msgid ""
diff --git a/src/nvim/po/zh_TW.UTF-8.po b/src/nvim/po/zh_TW.UTF-8.po
index 578464bbe3..02954b27d1 100644
--- a/src/nvim/po/zh_TW.UTF-8.po
+++ b/src/nvim/po/zh_TW.UTF-8.po
@@ -4669,12 +4669,8 @@ msgstr ""
 "�能執行 shell"
 
 #: ../os/shell.c:439
-msgid ""
-"\n"
-"shell returned "
-msgstr ""
-"\n"
-"Shell 已返回"
+msgid "shell returned "
+msgstr "Shell 已返回"
 
 #: ../os_unix.c:465 ../os_unix.c:471
 msgid ""
diff --git a/src/nvim/ui.c b/src/nvim/ui.c
index 95889eedf9..c730631378 100644
--- a/src/nvim/ui.c
+++ b/src/nvim/ui.c
@@ -785,6 +785,10 @@ void ui_call_event(char *name, Array args)
     "lua_error",
     "lua_print",
     "progress",
+    "shell_cmd",
+    "shell_err",
+    "shell_out",
+    "shell_ret",
     NULL,
   };
 
diff --git a/test/functional/ui/messages_spec.lua b/test/functional/ui/messages_spec.lua
index 1e1147e9ee..e6041d0bcb 100644
--- a/test/functional/ui/messages_spec.lua
+++ b/test/functional/ui/messages_spec.lua
@@ -439,12 +439,14 @@ describe('ui/ext_messages', function()
         {
           content = { { ('stdout%s\n'):format(t.is_os('win') and '\r' or ''), 'StdoutMsg' } },
           kind = 'shell_out',
+          append = true,
         },
         {
           content = { { ('stderr%s\n'):format(t.is_os('win') and '\r' or ''), 9, 'StderrMsg' } },
           kind = 'shell_err',
+          append = true,
         },
-        { content = { { '\nshell returned 3\n' } }, kind = 'shell_ret' },
+        { content = { { 'shell returned 3' } }, kind = 'shell_ret' },
       },
     })