diff --git a/src/Core/Entities/PlayerEntity.m b/src/Core/Entities/PlayerEntity.m
index 1dcf6a96..12be7e37 100644
--- a/src/Core/Entities/PlayerEntity.m
+++ b/src/Core/Entities/PlayerEntity.m
@@ -7187,7 +7187,7 @@ static NSString *last_outfitting_key=nil;
 
 - (void) receiveCommsMessage:(NSString *) message_text from:(ShipEntity *) other
 {
-	[UNIVERSE addCommsMessage:message_text forCount:4.5];
+	[UNIVERSE addCommsMessage:[NSString stringWithFormat:@"%@:\n %@", [other displayName], message_text] forCount:4.5];
 	[super receiveCommsMessage:message_text from:other];
 }
 
diff --git a/src/Core/Entities/ShipEntity.m b/src/Core/Entities/ShipEntity.m
index fcb4de2e..8b2e2b44 100644
--- a/src/Core/Entities/ShipEntity.m
+++ b/src/Core/Entities/ShipEntity.m
@@ -3639,9 +3639,7 @@ ShipEntity* doOctreesCollide(ShipEntity* prime, ShipEntity* other)
 	double eta = (distance - desired_range) / flightSpeed;
 	if(eta < 0) eta = 0;
 	if ((eta < 5.0)&&(leadShip)&&(leadShip->isShip))
-		desired_speed = [leadShip flightSpeed] * (1 + eta * 0.05); // EW: This code works better, specialy at low speeds.
-		// desired_speed = [leadShip flightSpeed] * 1.25; // EW Original code, escorts always fly 25% to fast or drop speed 50% later on.
-		// this speed dropping does not work well at low speeds leading to escorts "waggling".
+		desired_speed = [leadShip flightSpeed] * (1 + eta * 0.05);
 	else
 		desired_speed = maxFlightSpeed;
 
@@ -9449,12 +9447,12 @@ static BOOL AuthorityPredicate(Entity *entity, void *parameter)
 	if (other_ship->isPlayer)
 	{
 		[self setCommsMessageColor];
-		[(PlayerEntity *)other_ship receiveCommsMessage:[NSString stringWithFormat:@"%@:\n %@", displayName, expandedMessage] from:self];
+		[(PlayerEntity *)other_ship receiveCommsMessage:expandedMessage from:self];
 		messageTime = 6.0;
 		[UNIVERSE resetCommsLogColor];
 	}
 	else
-		[other_ship receiveCommsMessage:[NSString stringWithFormat:@"%@:\n %@", displayName, expandedMessage] from:self];
+		[other_ship receiveCommsMessage:expandedMessage from:self];
 }
 
 
@@ -9507,7 +9505,8 @@ static BOOL AuthorityPredicate(Entity *entity, void *parameter)
 
 - (void) broadcastMessage:(NSString *) message_text withUnpilotedOverride:(BOOL) unpilotedOverride
 {
-	NSString* expandedMessage = [NSString stringWithFormat:@"%@:\n %@", displayName, ExpandDescriptionForCurrentSystem(message_text)];
+	NSString* expandedMessage = ExpandDescriptionForCurrentSystem(message_text); // consistent with broadcast message.
+
 
 	if (!crew && !unpilotedOverride)
 		return;	// nobody to send the signal and no override for unpiloted craft is set