diff --git a/retroshare-qml-app/src/ChatView.qml b/retroshare-qml-app/src/ChatView.qml
index 144d77e29..8a814545b 100644
--- a/retroshare-qml-app/src/ChatView.qml
+++ b/retroshare-qml-app/src/ChatView.qml
@@ -257,6 +257,7 @@ Item
 					}
 					function reset ()
 					{
+						msgField.text = ""
 						Qt.inputMethod.reset()
 					}
 				}
@@ -362,13 +363,13 @@ Item
 	{
 		if (emojiPicker.state == "EMOJI_SHOWN") emojiPicker.state = "EMOJI_HIDDEN"
 
-		var msgText = getCompleteMessageText()
+		msgField.text = getCompleteMessageText () + " " // Needed to prevent pre edit text problems
+		var msgText = msgField.text
 
 		var jsonData = {"chat_id":chatView.chatId, "msg":msgText}
 		rsApi.request( "/chat/send_message", JSON.stringify(jsonData),
 					   function(par)
 					   {
-						    msgField.text = ""
 						   msgField.reset();
 					   })
 	}
diff --git a/retroshare-qml-app/src/Locations.qml b/retroshare-qml-app/src/Locations.qml
index ed24de4fe..f7ea51c84 100644
--- a/retroshare-qml-app/src/Locations.qml
+++ b/retroshare-qml-app/src/Locations.qml
@@ -145,7 +145,7 @@ Item
 		{
 			id: delegate
 			width: parent.width
-			height: locationButton.height + 5
+			height: 60
 			Rectangle
 			{
 				id: backgroundRectangle
@@ -171,6 +171,7 @@ Item
 			{
 				id: locationButton
 				anchors.horizontalCenter: parent.horizontalCenter
+				anchors.verticalCenter: parent.verticalCenter
 				text: model.name
 				borderRadius:0
 				iconUrl: "/icons/edit-image-face-detect.svg"
diff --git a/retroshare-qml-app/src/components/AvatarOrColorHash.qml b/retroshare-qml-app/src/components/AvatarOrColorHash.qml
index 4786dbca1..c0ac5ebc4 100644
--- a/retroshare-qml-app/src/components/AvatarOrColorHash.qml
+++ b/retroshare-qml-app/src/components/AvatarOrColorHash.qml
@@ -136,6 +136,7 @@ Item
 		id: contactAvatar
 		anchors.fill: parent
 		visible: compRoot.has_avatar
+		fillMode: Image.PreserveAspectFit
 	}
 
 	Faces