diff --git a/src/common/kernel/magic.c b/src/common/kernel/magic.c
index 0117a43c9..d32491c90 100644
--- a/src/common/kernel/magic.c
+++ b/src/common/kernel/magic.c
@@ -1630,9 +1630,8 @@ verify_targets(castorder *co)
 						spobj->data.i = sh->no;
 						spobj->flag = TARGET_RESISTS;
 						resists++;
-						add_message(&mage->faction->msgs, new_message(mage->faction,
-							"spellshipresists%u:unit%r:region%s:command%d:id",
-							mage, mage->region, co->order, spobj->data.i));
+						ADDMSG(&mage->faction->msgs, msg_feedback(mage, co->order, 
+              "spellshipresists", "ship", sh));
 						break;
 					}
 					success++;
diff --git a/src/res/messages.xml b/src/res/messages.xml
index 1229f8f2f..58db7d396 100644
--- a/src/res/messages.xml
+++ b/src/res/messages.xml
@@ -1258,11 +1258,11 @@
       <arg name="unit" type="unit"/>
       <arg name="region" type="region"/>
       <arg name="command" type="order"/>
-      <arg name="id" type="int"/>
+      <arg name="ship" type="ship"/>
     </type>
-    <text locale="de">"$unit($unit) in $region($region): '$order($command)' - Schiff $int36($id) konnte nicht verzaubert werden."</text>
-    <text locale="fr">"$unit($unit) in $region($region): '$order($command)' - Ship $int36($id) could not be charmed."</text>
-    <text locale="en">"$unit($unit) in $region($region): '$order($command)' - Ship $int36($id) could not be charmed."</text>
+    <text locale="de">"$unit($unit) in $region($region): '$order($command)' - $ship($ship) widersteht dem Zauber."</text>
+    <text locale="fr">"$unit($unit) in $region($region): '$order($command)' - $ship($ship) resists the spell."</text>
+    <text locale="en">"$unit($unit) in $region($region): '$order($command)' - $ship($ship) resists the spell."</text>
   </message>
   <message name="spellbuildingresists" section="magic">
     <type>