diff --git a/data/glade/message_window.glade b/data/glade/message_window.glade
index ad3263915..bafc686ce 100644
--- a/data/glade/message_window.glade
+++ b/data/glade/message_window.glade
@@ -111,6 +111,16 @@
                                     <property name="position">3</property>
                                   </packing>
                                 </child>
+                                <child>
+                                  <widget class="GtkImage" id="video_banner_image">
+                                    <property name="visible">True</property>
+                                    <property name="stock">None</property>
+                                    <property name="icon-size">1</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="position">4</property>
+                                  </packing>
+                                </child>
                                 <child>
                                   <widget class="GtkAlignment" id="alignment3">
                                     <property name="width_request">11</property>
@@ -120,7 +130,7 @@
                                     </child>
                                   </widget>
                                   <packing>
-                                    <property name="position">4</property>
+                                    <property name="position">5</property>
                                   </packing>
                                 </child>
                               </widget>
diff --git a/src/chat_control.py b/src/chat_control.py
index 4c980b544..f650d90ef 100644
--- a/src/chat_control.py
+++ b/src/chat_control.py
@@ -1263,7 +1263,9 @@ class ChatControl(ChatControlBase, ChatCommands):
 		else:
 			self.set_video_state('not_available')
 		self.audio_sid = None
+		self.audio_state = self.JINGLE_STATE_NOT_AVAILABLE
 		self.video_sid = None
+		self.video_state = self.JINGLE_STATE_NOT_AVAILABLE
 
 		self.update_toolbar()