diff --git a/ethermess.py b/ethermess.py
index 9e65ed9..f044c94 100644
--- a/ethermess.py
+++ b/ethermess.py
@@ -350,8 +350,12 @@ def nick_from_mac(mac):
 def handle_message(mac, message):
 	nick = nick_from_mac(mac)
 	ts = timestamp()
-	for line in message.split('\n'):
-		print('%s <%s> %s' % (ts, nick, line))
+	if mac == default_target_mac:
+		for line in message.split('\n'):
+			print('%s <*%s> %s' % (ts, nick, line))
+	else:
+		for line in message.split('\n'):
+			print('%s < %s> %s' % (ts, nick, line))
 
 def eventloop(proc):
 	global peers