diff --git a/app/src/main/java/org/thoughtcrime/securesms/calls/WebRtcCallActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/calls/WebRtcCallActivity.kt
index 19d0cc7d41..3e6ccc28b6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/calls/WebRtcCallActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/calls/WebRtcCallActivity.kt
@@ -201,6 +201,7 @@ class WebRtcCallActivity: PassphraseRequiredActionBarActivity() {
                         CALL_RINGING -> {
                             if (wantsToAnswer) {
                                 answerCall()
+                                wantsToAnswer = false
                             }
                         }
                         CALL_OUTGOING -> {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/webrtc/CallManager.kt b/app/src/main/java/org/thoughtcrime/securesms/webrtc/CallManager.kt
index 53c91689bc..45e30bf70c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/webrtc/CallManager.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/webrtc/CallManager.kt
@@ -181,6 +181,7 @@ class CallManager(context: Context, audioManager: AudioManagerCompat, private va
             remoteRenderer = SurfaceViewRenderer(context)
 
             localRenderer?.init(base.eglBaseContext, null)
+            localRenderer?.setMirror(true)
             remoteRenderer?.init(base.eglBaseContext, null)
 
             val encoderFactory = DefaultVideoEncoderFactory(base.eglBaseContext, true, true)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/webrtc/CallMessageProcessor.kt b/app/src/main/java/org/thoughtcrime/securesms/webrtc/CallMessageProcessor.kt
index 345f8ccee1..5e06c3beea 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/webrtc/CallMessageProcessor.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/webrtc/CallMessageProcessor.kt
@@ -29,7 +29,7 @@ class CallMessageProcessor(private val context: Context, lifecycle: Lifecycle, p
                 val nextMessage = WebRtcUtils.SIGNAL_QUEUE.receive()
                 Log.d("Loki", nextMessage.type?.name ?: "CALL MESSAGE RECEIVED")
                 val sender = nextMessage.sender ?: continue
-                if (!storage.conversationHasOutgoing(sender)) continue
+                if (!storage.conversationHasOutgoing(sender) && storage.getUserPublicKey() != sender) continue
 
                 if (!TextSecurePreferences.isCallNotificationsEnabled(context)) {
                     Log.d("Loki","Dropping call message if call notifications disabled")