diff --git a/resources/qml/ActiveCallBar.qml b/resources/qml/ActiveCallBar.qml
index 2a83a8e1..282cac81 100644
--- a/resources/qml/ActiveCallBar.qml
+++ b/resources/qml/ActiveCallBar.qml
@@ -50,7 +50,9 @@ Rectangle {
         }
 
         Connections {
-            function onCallStateChanged(state) {
+            target: TimelineManager
+
+            onCallStateChanged: {
                 switch (state) {
                 case WebRTCState.INITIATING:
                     callStateLabel.text = qsTr("Initiating...");
@@ -73,8 +75,6 @@ Rectangle {
                     stackLayout.currentIndex = 0;
                 }
             }
-
-            target: TimelineManager
         }
 
         Timer {
diff --git a/resources/qml/MessageView.qml b/resources/qml/MessageView.qml
index 09220a71..af0c0aca 100644
--- a/resources/qml/MessageView.qml
+++ b/resources/qml/MessageView.qml
@@ -180,13 +180,13 @@ ListView {
         }
 
         Connections {
-            function onMovementEnded() {
+            target: chat
+
+            onMovementEnded: {
                 if (y + height + 2 * chat.spacing > chat.contentY + chat.height && y < chat.contentY + chat.height)
                     chat.model.currentIndex = index;
 
             }
-
-            target: chat
         }
 
     }
diff --git a/resources/qml/TimelineView.qml b/resources/qml/TimelineView.qml
index 9d00442c..95143b18 100644
--- a/resources/qml/TimelineView.qml
+++ b/resources/qml/TimelineView.qml
@@ -128,25 +128,25 @@ Page {
         }
 
         Connections {
-            function onNewDeviceVerificationRequest(flow, transactionId, userId, deviceId, isRequest) {
+            target: TimelineManager
+
+            onNewDeviceVerificationRequest: {
                 var dialog = deviceVerificationDialog.createObject(timelineRoot, {
                     "flow": flow
                 });
                 dialog.show();
             }
-
-            target: TimelineManager
         }
 
         Connections {
-            function onOpenProfile(profile) {
+            target: TimelineManager.timeline
+            
+            onOpenProfile: {
                 var userProfile = userProfileComponent.createObject(timelineRoot, {
                     "profile": profile
                 });
                 userProfile.show();
             }
-
-            target: TimelineManager.timeline
         }
 
         Label {