diff --git a/app.js b/app.js
index fe7764aba..72ff8600b 100644
--- a/app.js
+++ b/app.js
@@ -99,7 +99,6 @@ function doJoin() {
 $(document).bind('mediaready.jingle', function (event, stream) {
     connection.jingle.localStream = stream;
     RTC.attachMediaStream($('#localVideo'), stream);
-    document.getElementById('localVideo').muted = true;
     document.getElementById('localVideo').autoplay = true;
     document.getElementById('localVideo').volume = 0;
 
@@ -107,7 +106,13 @@ $(document).bind('mediaready.jingle', function (event, stream) {
     updateLargeVideo(localVideoSrc, true, 0);
 
     $('#localVideo').click(function () {
-        updateLargeVideo($(this).attr('src'), true, 1);
+	updateLargeVideo($(this).attr('src'), true, 0);
+        $('video').each(function (idx, el) {
+            if (el.id.indexOf('mixedmslabel') != -1) {
+                el.volume = 0;
+                el.volume = 1;
+            } 
+        });
     });
 
     doJoin();
@@ -1102,4 +1107,3 @@ function scrollChatToBottom() {
         $('#chatconversation').scrollTop($('#chatconversation')[0].scrollHeight);
     }, 5);
 }
-
diff --git a/index.html b/index.html
index 20ea0b7d0..d7a89c283 100644
--- a/index.html
+++ b/index.html
@@ -7,7 +7,7 @@
     <script src="//code.jquery.com/ui/1.10.4/jquery-ui.js"></script>
     <script src="muc.js?v=4"></script><!-- simple MUC library -->
     <script src="estos_log.js?v=2"></script><!-- simple stanza logger -->
-    <script src="app.js?v=11"></script><!-- application logic -->
+    <script src="app.js?v=12"></script><!-- application logic -->
     <link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" rel="stylesheet">
     <link rel="stylesheet" type="text/css" media="screen" href="css/main.css?v=12"/>
     <link rel="stylesheet" href="css/jquery-impromptu.css?v=3">