diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index d2bb043e99..42e785bfd6 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -243,20 +243,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
 
     @Override
     public void setPlayerListHeader(String header) {
-        this.playerListHeader = CraftChatMessage.fromStringOrNull(header);
+        this.playerListHeader = CraftChatMessage.fromStringOrNull(header, true);
         updatePlayerListHeaderFooter();
     }
 
     @Override
     public void setPlayerListFooter(String footer) {
-        this.playerListFooter = CraftChatMessage.fromStringOrNull(footer);
+        this.playerListFooter = CraftChatMessage.fromStringOrNull(footer, true);
         updatePlayerListHeaderFooter();
     }
 
     @Override
     public void setPlayerListHeaderFooter(String header, String footer) {
-        this.playerListHeader = CraftChatMessage.fromStringOrNull(header);
-        this.playerListFooter = CraftChatMessage.fromStringOrNull(footer);
+        this.playerListHeader = CraftChatMessage.fromStringOrNull(header, true);
+        this.playerListFooter = CraftChatMessage.fromStringOrNull(footer, true);
         updatePlayerListHeaderFooter();
     }
 
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java b/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
index a067e39d54..d054405e48 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
@@ -143,7 +143,11 @@ public final class CraftChatMessage {
     }
 
     public static IChatBaseComponent fromStringOrNull(String message) {
-        return (message == null || message.isEmpty()) ? null : fromString(message)[0];
+        return fromStringOrNull(message, false);
+    }
+
+    public static IChatBaseComponent fromStringOrNull(String message, boolean keepNewlines) {
+        return (message == null || message.isEmpty()) ? null : fromString(message, keepNewlines)[0];
     }
 
     public static IChatBaseComponent[] fromString(String message) {