diff --git a/go/gothings/uistate.go b/go/gothings/uistate.go
index 78c1e34..547524f 100644
--- a/go/gothings/uistate.go
+++ b/go/gothings/uistate.go
@@ -74,21 +74,16 @@ func (this *InterfaceState) AddMessage(m *gobjects.Message) {
 	_, found := this.contacts[m.Handle]
 	if !found {
 		this.AddContact(&gobjects.Contact{
-			m.DisplayName,
-			m.Image,
 			m.Handle,
+			m.Handle,
+			cwutil.RandomProfileImage(m.Handle),
 			"",
-			1,
+			0,
 			0,
 			false,
 		})
 	}
 
-	c := the.Peer.GetContact(m.Handle)
-	if c == nil {
-
-	}
-
 	_, found = this.messages[m.Handle]
 	if !found {
 		this.messages[m.Handle] = make([]*gobjects.Message, 0)
diff --git a/qml/overlays/ChatOverlay.qml b/qml/overlays/ChatOverlay.qml
index 3f813f4..24130e2 100644
--- a/qml/overlays/ChatOverlay.qml
+++ b/qml/overlays/ChatOverlay.qml
@@ -102,6 +102,9 @@ ColumnLayout {
 
 			Flickable {
 				id: flkMessage
+				anchors.fill: parent//this does nothing! bug in qt
+				Layout.minimumWidth: parent.width
+				Layout.maximumWidth: parent.width
 				Layout.minimumHeight: rectMessage.height
 				Layout.maximumHeight: rectMessage.height
 				contentWidth: txtMessage.width
@@ -120,6 +123,7 @@ ColumnLayout {
 					padding: 6
 					wrapMode: TextEdit.Wrap
 					textFormat: Text.RichText
+					width: rectMessage.width
 
 					property bool skipOneUpdate: false