diff --git a/OpenRA.Game/Network/UnitOrders.cs b/OpenRA.Game/Network/UnitOrders.cs
index 66dd060a0d..41ae9879f5 100755
--- a/OpenRA.Game/Network/UnitOrders.cs
+++ b/OpenRA.Game/Network/UnitOrders.cs
@@ -34,7 +34,7 @@ namespace OpenRA.Network
 				{
 					var client = Game.LobbyInfo.Clients.FirstOrDefault(c => c.Index == clientId);
 					if (client != null && Chrome.chatWidget != null)
-						Chrome.chatWidget.AddLine(client, order.TargetString);
+						Chrome.chatWidget.AddLine(Game.world.PlayerColors()[client.PaletteIndex].Color, client.Name, order.TargetString);
 					break;
 				}
 			case "TeamChat":
@@ -45,10 +45,10 @@ namespace OpenRA.Network
 						var player = Game.world.players.Values.FirstOrDefault(p => p.Index == client.Index);
 						var isAlly = (world.GameHasStarted) ? 
 							player != null && Game.world.LocalPlayer != null && player.Stances[Game.world.LocalPlayer] == Stance.Ally :
-							client.Team == Game.LocalClient.Team;
-						
+							client.Team == Game.LocalClient.Team && client.Team != 0;
+
 						if (isAlly)
-							Chrome.chatWidget.AddLine(client, "(Team) " + order.TargetString);
+							Chrome.chatWidget.AddLine(Game.world.PlayerColors()[client.PaletteIndex].Color, client.Name + " (Team)", order.TargetString);
 					}
 					break;
 				}
diff --git a/OpenRA.Game/Widgets/ChatDisplayWidget.cs b/OpenRA.Game/Widgets/ChatDisplayWidget.cs
new file mode 100644
index 0000000000..7150167fba
--- /dev/null
+++ b/OpenRA.Game/Widgets/ChatDisplayWidget.cs
@@ -0,0 +1,105 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using OpenRA.FileFormats;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System;
+
+namespace OpenRA.Widgets
+{
+	class ChatDisplayWidget : Widget
+	{
+		const int logLength = 10;
+		public string Notification = "";
+
+		public List<ChatLine> recentLines = new List<ChatLine>();
+		
+		public ChatDisplayWidget()
+			: base() {}
+		
+		public ChatDisplayWidget(Widget widget)
+			:base(widget) {}
+
+		public override void DrawInner(World world)
+		{
+			var pos = DrawPosition();
+			var chatLogArea = new Rectangle(pos.X, pos.Y, Bounds.Width, Bounds.Height);
+			var chatpos = new int2(chatLogArea.X + 10, chatLogArea.Bottom - 6);
+			WidgetUtils.DrawPanel("dialog3", chatLogArea);
+			
+			var renderer = Game.chrome.renderer;
+			var font = renderer.RegularFont;
+			
+			renderer.Device.EnableScissor(chatLogArea.Left, chatLogArea.Top, chatLogArea.Width, chatLogArea.Height);
+			foreach (var line in recentLines.AsEnumerable().Reverse())
+			{
+				chatpos.Y -= 20;
+				var owner = line.Owner + ":";
+				var inset = font.Measure(owner).X + 10;
+				font.DrawText(owner, chatpos, line.Color);
+				font.DrawText(line.Text, chatpos + new int2(inset, 0), Color.White);
+			}
+
+			renderer.RgbaSpriteRenderer.Flush();
+			renderer.Device.DisableScissor();
+		}
+
+		public void AddLine(Color c, string from, string text)
+		{
+			var sizeOwner = Game.chrome.renderer.RegularFont.Measure(from);
+			var sizeText = Game.chrome.renderer.RegularFont.Measure(text);
+			
+			if (sizeOwner.X + sizeText.X + 10 <= Chrome.ChatWidth)
+				recentLines.Add(new ChatLine { Color = c, Owner = from, Text = text });
+			else
+			{
+				StringBuilder sb = new StringBuilder();
+				foreach (var w in text.Split(' '))
+				{
+					if ( Game.chrome.renderer.RegularFont.Measure(sb.ToString() + ' ' + w).X > Chrome.ChatWidth )
+					{
+						recentLines.Add(new ChatLine { Color = c, Owner = from, Text = sb.ToString() } );
+						sb = new StringBuilder();
+						sb.Append(w);
+					}
+					else 
+						sb.Append( ' '  + w);
+				}
+				if (sb.Length != 0)	
+					recentLines.Add(new ChatLine { Color = c, Owner = from, Text = sb.ToString() } );
+			}
+			
+			if (Notification != null)
+				Sound.Play(Notification);
+			
+			while (recentLines.Count > logLength) recentLines.RemoveAt(0);
+		}
+		
+		public override Widget Clone()
+		{	
+			return new ChatDisplayWidget(this);
+		}
+	}
+	class ChatLine { public Color Color = Color.White; public string Owner, Text; public bool wrapped = false; }
+
+}
\ No newline at end of file