diff --git a/gui/griffon-app/views/com/muwire/gui/ChatRoomView.groovy b/gui/griffon-app/views/com/muwire/gui/ChatRoomView.groovy
index 48560e22..b10e569f 100644
--- a/gui/griffon-app/views/com/muwire/gui/ChatRoomView.groovy
+++ b/gui/griffon-app/views/com/muwire/gui/ChatRoomView.groovy
@@ -256,10 +256,13 @@ class ChatRoomView {
                 sender.getPersona() != model.core.me &&
                 text.contains("@${model.core.me.toBase64()}@"))
             chatNotificator.notifyMention()
+
+        
+        boolean trusted = model.core.trustService.getLevel(sender.getPersona().getDestination()) == TrustLevel.TRUSTED
+        def textField = new ChatEntry(text, settings, model::getByPersona, muLinkConsumer, timestamp, sender, trusted)
+        
         
         StyledDocument doc = roomTextArea.getStyledDocument()
-        
-        def textField = new ChatEntry(text, settings, model::getByPersona, muLinkConsumer, timestamp, sender)
         def style = doc.addStyle("newStyle", null)
         StyleConstants.setComponent(style, textField)
         doc.insertString(doc.getEndPosition().getOffset() - 1, " ", style)
diff --git a/gui/src/main/groovy/com/muwire/gui/chat/ChatEntry.groovy b/gui/src/main/groovy/com/muwire/gui/chat/ChatEntry.groovy
index d786cdbd..713333f7 100644
--- a/gui/src/main/groovy/com/muwire/gui/chat/ChatEntry.groovy
+++ b/gui/src/main/groovy/com/muwire/gui/chat/ChatEntry.groovy
@@ -17,6 +17,7 @@ import javax.swing.text.Document
 import javax.swing.text.SimpleAttributeSet
 import javax.swing.text.StyleConstants
 import javax.swing.text.StyledDocument
+import java.awt.Color
 import java.text.SimpleDateFormat
 import java.util.function.Consumer
 import java.util.function.Function 
@@ -38,7 +39,7 @@ class ChatEntry extends JTextPane {
     
     ChatEntry(String text, UISettings settings, Function<Persona, PersonaOrProfile> function,
             Consumer<MuLink> linkConsumer,
-        long timestamp, PersonaOrProfile sender) {
+        long timestamp, PersonaOrProfile sender, boolean trusted) {
         super()
         this.settings = settings
         this.function = function
@@ -55,7 +56,13 @@ class ChatEntry extends JTextPane {
         StyledDocument doc = getStyledDocument()
         doc.insertString(doc.getEndPosition().getOffset() - 1, SDF.format(new Date(timestamp)) + " ", null)
 
-        Border border = BorderFactory.createEmptyBorder(0, 5, 0, 5)
+        Border border = trusted ? 
+                BorderFactory.createEtchedBorder(Color.GREEN, Color.GREEN) :
+                BorderFactory.createEmptyBorder()
+        
+        border = BorderFactory.createCompoundBorder(border,
+                BorderFactory.createEmptyBorder(0, 5, 0, 5))
+        
         def label = new POPLabel(sender, settings, border, JLabel.TOP)
         def style = doc.addStyle("newStyle", null)
         StyleConstants.setComponent(style, label)