diff --git a/qml/widgets/ContactPicture.qml b/qml/widgets/ContactPicture.qml
index f158872..d46be94 100644
--- a/qml/widgets/ContactPicture.qml
+++ b/qml/widgets/ContactPicture.qml
@@ -11,9 +11,11 @@ Item {
 	implicitHeight: 48
 	anchors.margins: 5
 
+	property string handle
 	property alias source: img.source
 	property int status
 	property bool isGroup
+	property bool showStatus
 
 
 	Rectangle {
@@ -44,6 +46,7 @@ Item {
 		}
 
 		Rectangle { // PRESENCE INDICATOR
+			visible: showStatus
 			color: "#FFFFFF"
 			width: 8
 			height: 8
diff --git a/qml/widgets/ContactRow.qml b/qml/widgets/ContactRow.qml
index 64f3ad7..eda8c7a 100644
--- a/qml/widgets/ContactRow.qml
+++ b/qml/widgets/ContactRow.qml
@@ -39,6 +39,7 @@ RowLayout { // LOTS OF NESTING TO DEAL WITH QT WEIRDNESS, SORRY
 
 			ContactPicture {
 				id: imgProfile
+				showStatus: true
 			}
 
 			Label { // CONTACT NAME
diff --git a/qml/widgets/Message.qml b/qml/widgets/Message.qml
index 4ccff9e..1309dfe 100644
--- a/qml/widgets/Message.qml
+++ b/qml/widgets/Message.qml
@@ -31,13 +31,16 @@ RowLayout {
 				ack.source = "qrc:/qml/images/fontawesome/regular/check-circle.svg"
 			}
 		}
+
 	}
 
 
 	ContactPicture {
 		id: imgProfile
 		anchors.left: parent.left
+		handle: root.from
 		visible: !fromMe
+		showStatus: false
 
 		MouseArea {
 			anchors.fill: parent
@@ -48,6 +51,7 @@ RowLayout {
 				overlayStack.overlay = overlayStack.chatOverlay
 			}
 		}
+
 	}
 
 	Rectangle { // THIS IS JUST A PRETTY MESSAGE-HOLDING RECTANGLE