diff --git a/data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg b/data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg
index 42e1a688768..810a7e05f89 100644
--- a/data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg
+++ b/data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg
@@ -384,7 +384,12 @@
     [event]
         name=turn 3
 
-        {NARRATOR _"Tracking Enemy Movement" _"You can see where an enemy can reach by moving the mouse over them. You can see all possible enemy moves at once with the <b>Show Enemy Moves</b> command from the <b>Actions</b> menu."}
+        [message]
+            speaker=narrator
+            caption= _ "Tracking Enemy Movement"
+            image=wesnoth-icon.png
+            message= _ "You can see where an enemy can reach by moving the mouse over them. You can see all possible enemy moves at once with the <b>Show Enemy Moves</b> command from the <b>Actions</b> menu."
+        [/message]
 
         {TALK_ABOUT Dumbo ( _ "We must occupy that island before the Wolf Riders reach it!")}
 
@@ -545,7 +550,12 @@
 
         {TALK_ABOUT_LOC 11,14 (_"Careful! It is now nighttime. Orcs are <i>chaotic</i>, which means their attacks are now 25% stronger. By day, their attacks are 25% weaker, which is a noticeable difference. You are <i>lawful</i>: stronger by day and weaker at night. Your elvish warriors are <i>neutral</i>: unaffected by the time of day.")}
 
-        {NARRATOR _"Time of Day" _"During a scenario, the time of day will shift as turns pass. There are four <i>alignments</i> a unit may be: Lawful, Neutral, Chaotic, or Liminal. Each alignment gets a different bonus or handicap depending on the time of day. You can mouse over the landscape image below the minimap on the right to see the current time of day and who has the advantage."}
+        [message]
+            speaker=narrator
+            caption= _ "Time of Day"
+            image=wesnoth-icon.png
+            message= _ "During a scenario, the time of day will shift as turns pass. There are four <i>alignments</i> a unit may be: Lawful, Neutral, Chaotic, or Liminal. Each alignment gets a different bonus or handicap depending on the time of day. You can mouse over the landscape image below the minimap on the right to see the current time of day and who has the advantage."
+        [/message]
     [/event]
 
     [event]
@@ -571,19 +581,34 @@
     [event]
         name=turn 9
 
-        {NARRATOR _"Tracking Unused Units" _"You can ensure you use all your troops by pressing <b>n</b> to step from one unit to the next. If you press <b>space</b>, you can mark the currently selected unit as having finished its turn, which stops you moving it by accident later on. When <b>n</b> no longer selects a new unit, it’s safe to end your turn."}
+        [message]
+            speaker=narrator
+            caption= _ "Tracking Unused Units"
+            image=wesnoth-icon.png
+            message= _ "You can ensure you use all your troops by pressing <b>n</b> to step from one unit to the next. If you press <b>space</b>, you can mark the currently selected unit as having finished its turn, which stops you moving it by accident later on. When <b>n</b> no longer selects a new unit, it’s safe to end your turn."
+        [/message]
     [/event]
 
     [event]
         name=turn 10
 
-        {NARRATOR _"Victory Conditions" _"In this scenario, you only need to defeat the orc leader to win. Victory conditions for a scenario are given under <b>Scenario Objectives</b> in  <b>Menu</b>)."}
+        [message]
+            speaker=narrator
+            caption= _ "Victory Conditions"
+            image=wesnoth-icon.png
+            message= _ "In this scenario, you only need to defeat the orc leader to win. Victory conditions for a scenario are given under <b>Scenario Objectives</b> in  <b>Menu</b>)."
+        [/message]
     [/event]
 
     [event]
         name=turn 12
 
-        {NARRATOR _"Recruit the Right Unit Types" _"Remember to recruit troops useful for the situation. Archers are particularly effective against Grunts, Wolf Riders and the orcish leader."}
+        [message]
+            speaker=narrator
+            caption= _ Recruit the Right Units
+            image=wesnoth-icon.png
+            message= _ "Remember to recruit troops useful for the situation. Archers are particularly effective against Grunts, Wolf Riders and the orcish leader."
+        [/message]
     [/event]
 
     [event]
diff --git a/data/campaigns/tutorial/utils/utils.cfg b/data/campaigns/tutorial/utils/utils.cfg
index cd6fa8d0d55..f0c12f822c2 100644
--- a/data/campaigns/tutorial/utils/utils.cfg
+++ b/data/campaigns/tutorial/utils/utils.cfg
@@ -30,16 +30,6 @@
     [/if]
 #enddef
 
-# TODO: decide to use or not
-#define NARRATOR CAPTION_TEXT MESSAGE_TEXT
-    [message]
-        speaker=narrator
-        caption={CAPTION_TEXT}
-        message={MESSAGE_TEXT}
-        image=wesnoth-icon.png
-    [/message]
-#enddef
-
 #define UNDO_REMINDER
     [message]
         speaker=narrator