diff --git a/Src/Network.cpp b/Src/Network.cpp
index ca380ff..0ef2d54 100644
--- a/Src/Network.cpp
+++ b/Src/Network.cpp
@@ -368,15 +368,17 @@ bool Network::DecodeDisplayUpdate(struct NetworkUpdate *src)
 	return false;
 }
 
-void Network::EncodeTextMessage(const char *str)
+void Network::EncodeTextMessage(const char *str, bool broadcast)
 {
 	NetworkUpdate *dst = (NetworkUpdate *)this->cur_ud;
-	char *p = (char*)dst->data;
+	struct NetworkUpdateTextMessage *tm = (struct NetworkUpdateTextMessage*)dst->data;
+	char *p = (char*)tm->data;
 	size_t len = strlen(str) + 1;
 
+	tm->flags = broadcast ? NETWORK_UPDATE_TEXT_MESSAGE_BROADCAST : 0;
 	len += (len & 3);
 	dst = InitNetworkUpdate(dst, TEXT_MESSAGE,
-			sizeof(NetworkUpdate) + len);
+			sizeof(NetworkUpdate) + sizeof(struct NetworkUpdateTextMessage) + len);
 	memset(p, 0, len);
 	strncpy(p, str, len - 1);
 
@@ -919,8 +921,11 @@ bool Network::DecodeUpdate(C64Display *display, uint8 *js, MOS6581 *dst)
 			}
 			break;
 		case TEXT_MESSAGE:
-			Gui::gui->status_bar->queueMessage((const char*)p->data);
-			break;
+		{
+			NetworkUpdateTextMessage *tm = (NetworkUpdateTextMessage*)p->data;
+
+			Gui::gui->status_bar->queueMessage((const char*)tm->data);
+		} break;
 		case REGISTER_DATA:
 		{
 			NetworkUpdateRegisterData *rd = (NetworkUpdateRegisterData *)p->data;
diff --git a/Src/Network.h b/Src/Network.h
index 9fd0dc9..726d02a 100644
--- a/Src/Network.h
+++ b/Src/Network.h
@@ -90,6 +90,13 @@ struct NetworkUpdateDisplay
 	uint8 data[];
 };
 
+#define NETWORK_UPDATE_TEXT_MESSAGE_BROADCAST 1
+struct NetworkUpdateTextMessage
+{
+	uint8 flags;  /* Broadcast or not */
+	uint8 data[]; /* NULL-terminated string */
+};
+
 struct NetworkUpdateJoystick
 {
 	uint8 val;
@@ -189,7 +196,7 @@ public:
 
 	void EncodeJoystickUpdate(Uint8 v);
 
-	void EncodeTextMessage(const char *str);
+	void EncodeTextMessage(const char *str, bool broadcast = false);
 
 	void EnqueueSound(uint32 linecnt, uint8 addr, uint8 val);
 
diff --git a/network-broker/network-broker b/network-broker/network-broker
index db43747..8036c34 100755
--- a/network-broker/network-broker
+++ b/network-broker/network-broker
@@ -19,6 +19,7 @@ PING               = 95 # Are you alive?
 ACK                = 94 # Yep
 REGISTER_DATA      = 90
 STOP               = 55 # No more packets
+TEXT_MESSAGE       =  9
 
 # Network regions
 REGION_UNKNOWN       = 0
@@ -32,7 +33,8 @@ REGION_EAST_ASIA     = 7
 REGION_OCEANIA       = 8
 REGION_ANTARTICA     = 9
 
-# Flags in list peers packet
+# Flags in packets
+NETWORK_UPDATE_TEXT_MESSAGE_BROADCAST = 1
 NETWORK_UPDATE_LIST_PEERS_IS_CONNECT = 1
 
 pkt_type_to_str = {
@@ -200,6 +202,31 @@ class DisconnectPacket(Packet):
         Packet.__init__(self)
         self.type = DISCONNECT
 
+class TextMessagePacket(Packet):
+    def __init__(self, message = ""):
+        Packet.__init__(self)
+        msg_len = len(message) + 1 # NULL
+
+        # Used only by the server
+        self.timestamp = time.mktime(time.localtime())
+        self.type = TEXT_MESSAGE
+        self.message = message
+        self.flags = NETWORK_UPDATE_TEXT_MESSAGE_BROADCAST # Always here
+        self.size = self.size + 1 + msg_len
+
+    def get_timestamp(self):
+        return self.timestamp
+
+    def demarshal_from_data(self, data):
+        Packet.demarshal_from_data(self, data)
+        # Flags is always broadcast
+        self.message = struct.unpack(">s", data[9:])[0]
+        self.size = 8 + 1 + len(self.message) + 1 # NULL
+
+    def marshal(self):
+        to_pad = len(self.message) % 3
+        return Packet.marshal(self) + struct.pack(">B%dsx" % len(self.message),
+                                                  self.flags, self.message)
 
 class SelectPeerPacket(Packet):
     def __init__(self):
@@ -400,7 +427,6 @@ class Peer:
             # First send the registry data
             for entry in registered_data:
                 rp = RegisterDataPacket(entry.get_key(), entry.get_metadata(), entry.get_data())
-                print "Sending reg data", entry.get_key(), len(entry.get_data())
                 self.send_packet(rp.marshal())
 
             # And send the packet to this peer
@@ -408,6 +434,10 @@ class Peer:
                                                               self.addr[0], self.addr[1]) )
             self.send_packet(lp.marshal())
 
+            # Send all current messages
+            for msg in self.srv.messages:
+                self.send_packet(msg.marshal())
+
         if pkt.type == REGISTER_DATA:
             # Save screenshot (maybe) if this is the screenshot key
             entry = pkt.get_entry()
@@ -440,6 +470,9 @@ class Peer:
         if pkt.type == ACK:
             self.last_ping = cur_time()
 
+        if pkt.type == TEXT_MESSAGE:
+            self.srv.enqueue_message(pkt)
+
     def seconds_since_last_ping(self):
         now = cur_time()
         return now - self.last_ping
@@ -538,6 +571,8 @@ class Broker(SocketServer.UDPServer):
         self.ping_seq = 0
         self.ip2c = ip2c
 
+        self.messages = []
+
         self.stat_html = stat_html
         self.stat_data = stat_data
         self.image_dir = image_dir
@@ -595,6 +630,21 @@ class Broker(SocketServer.UDPServer):
                 return v
         return None
 
+    def enqueue_message(self, message):
+        # Store last 10 messages
+        self.messages = self.messages[-9:] + [message]
+
+        for peer in self.peers:
+            peer.send_packet(message)
+
+    def dequeue_old_messages(self):
+        now = time.mktime(time.localtime())
+        for msg in self.messages:
+            diff = now - msg.get_timestamp()
+            # Older than one day?
+            if diff > 24 * 60 * 60:
+                del msg
+
     def ping_all_peers(self):
         """Ping all peers (to see that they are alive)"""
         for k,v in self.peers.iteritems():
@@ -619,6 +669,8 @@ def ping_thread_fn(broker, time_to_sleep):
 
     while True:
         try:
+            broker.dequeue_old_messages()
+
             broker.ping_all_peers()
             time.sleep( time_to_sleep )
 
@@ -642,6 +694,7 @@ packet_class_by_type = {
     SELECT_PEER : SelectPeerPacket,
     REGISTER_DATA : RegisterDataPacket,
     DISCONNECT : DisconnectPacket,
+    TEXT_MESSAGE : TextMessagePacket,
     ACK : PingAckPacket,
 }