diff --git a/src/common/kernel/battle.c b/src/common/kernel/battle.c
index aea620c35..48b7b9a4d 100644
--- a/src/common/kernel/battle.c
+++ b/src/common/kernel/battle.c
@@ -1718,6 +1718,7 @@ getreload(troop at)
 	return at.fighter->person[at.index].reload;
 }
 
+#ifdef SMALL_BATTLE_MESSAGES
 static char *
 attack_message(const troop at, const troop dt, const weapon * wp, int dist)
 {
@@ -1756,6 +1757,7 @@ attack_message(const troop at, const troop dt, const weapon * wp, int dist)
 
 	return smallbuf;
 }
+#endif
 
 int
 hits(troop at, troop dt, weapon * awp)
@@ -2731,9 +2733,9 @@ print_stats(battle * b)
           unit *u = tf->unit;
           message * m = NULL;
           if (!fval(tf, FIG_ATTACKED)) {
-            msg_message("battle::tactics_lost", "unit", u);
+            m = msg_message("battle::tactics_lost", "unit", u);
           } else {
-            msg_message("battle::tactics_won", "unit", u);
+            m = msg_message("battle::tactics_won", "unit", u);
           }
           message_all(b, m);
           msg_release(m);
diff --git a/src/res/messages.xml b/src/res/messages.xml
index a64112e82..a31c1c04a 100644
--- a/src/res/messages.xml
+++ b/src/res/messages.xml
@@ -5721,13 +5721,13 @@
     <text locale="de">"$unit($unit) versucht $spell($spell) zu zaubern, doch der Zauber schlägt fehl!"</text>
     <text locale="en">"$unit($unit) tries to cast $spell($spell), but the spell fails!"</text>
   </message>
-  <message name="battle::row_header" section="battle">
+  <message name="battle::aborted" section="battle">
     <type>
     </type>
     <text locale="de">"Der Kampf wurde abgebrochen, da alle Verteidiger flohen."</text>
     <text locale="en">"The battle was aborted because all enemies escaped."</text>
   </message>
-  <message name="battle::aborted" section="battle">
+  <message name="battle::row_header" section="battle">
     <type>
       <arg name="row" type="int"/>
     </type>