diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
index 16f0de4c7..f1dc883cb 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
+++ b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
@@ -421,6 +421,22 @@ public class CallActivity extends CallBaseActivity {
             } else if (viewState instanceof RaiseHandViewModel.LoweredHandState) {
                 binding.lowerHandButton.setVisibility(View.GONE);
             }
+
+            // TODO: build&send raiseHand message (if not possible in RaiseHandViewModel, just do it here..)
+//        if (isConnectionEstablished() && peerConnectionWrapperList != null) {
+//            if (!hasMCU) {
+//                for (PeerConnectionWrapper peerConnectionWrapper : peerConnectionWrapperList) {
+//                    peerConnectionWrapper.raiseHand(...);
+//                }
+//            } else {
+//                for (PeerConnectionWrapper peerConnectionWrapper : peerConnectionWrapperList) {
+//                    if (peerConnectionWrapper.getSessionId().equals(webSocketClient.getSessionId())) {
+//                        peerConnectionWrapper.raiseHand(...);
+//                        break;
+//                    }
+//                }
+//            }
+//        }
         });
 
         callRecordingViewModel = new ViewModelProvider(this, viewModelFactory).get((CallRecordingViewModel.class));
@@ -1248,22 +1264,6 @@ public class CallActivity extends CallBaseActivity {
 
     public void clickRaiseOrLowerHandButton() {
         raiseHandViewModel.clickHandButton();
-
-        // TODO: fix how to build&send the message
-//        if (isConnectionEstablished() && peerConnectionWrapperList != null) {
-//            if (!hasMCU) {
-//                for (PeerConnectionWrapper peerConnectionWrapper : peerConnectionWrapperList) {
-//                    peerConnectionWrapper.raiseHand(raise);
-//                }
-//            } else {
-//                for (PeerConnectionWrapper peerConnectionWrapper : peerConnectionWrapperList) {
-//                    if (peerConnectionWrapper.getSessionId().equals(webSocketClient.getSessionId())) {
-//                        peerConnectionWrapper.raiseHand(raise);
-//                        break;
-//                    }
-//                }
-//            }
-//        }
     }
 
 
diff --git a/app/src/main/java/com/nextcloud/talk/webrtc/PeerConnectionWrapper.java b/app/src/main/java/com/nextcloud/talk/webrtc/PeerConnectionWrapper.java
index 69ddb15e8..13f26a83c 100644
--- a/app/src/main/java/com/nextcloud/talk/webrtc/PeerConnectionWrapper.java
+++ b/app/src/main/java/com/nextcloud/talk/webrtc/PeerConnectionWrapper.java
@@ -191,8 +191,7 @@ public class PeerConnectionWrapper {
     }
 
     public void raiseHand(Boolean raise) {
-
-        // TODO: fix how to build&send the message
+        // TODO: build&send raiseHand message (either here or via RaiseHandViewModel)
 //        NCMessagePayload ncMessagePayload = new NCMessagePayload();
 //        ncMessagePayload.setState(raise);
 //        ncMessagePayload.setTimestamp(System.currentTimeMillis());