diff --git a/src/ConversationVC.mm b/src/ConversationVC.mm
index 0c8e503..cd110f3 100644
--- a/src/ConversationVC.mm
+++ b/src/ConversationVC.mm
@@ -165,11 +165,10 @@
 
 - (IBAction)sendMessage:(id)sender
 {
-    auto* conv = [self getCurrentConversation];
     /* make sure there is text to send */
     NSString* text = self.message;
     if (text && text.length > 0) {
-        convModel_->sendMessage(conv->uid, std::string([text UTF8String]));
+        convModel_->sendMessage(convUid_, std::string([text UTF8String]));
         self.message = @"";
         [messagesViewVC newMessageSent];
     }
diff --git a/src/CurrentCallVC.mm b/src/CurrentCallVC.mm
index 2b5e137..f38b8af 100644
--- a/src/CurrentCallVC.mm
+++ b/src/CurrentCallVC.mm
@@ -148,6 +148,7 @@
     callUid_ = callUid;
     convUid_ = convUid;
     accountInfo_ = account;
+    [self.chatVC setConversationUid:convUid model:account->conversationModel.get()];
 }
 
 - (void)awakeFromNib
@@ -204,6 +205,7 @@
     [outgoingPanel setHidden:YES];
     [controlsPanel setHidden:NO];
     [headerContainer setHidden:NO];
+    [chatButton setHidden:NO];
 
     using Status = lrc::api::call::Status;
     switch (currentCall.status) {
diff --git a/ui/Base.lproj/CurrentCall.xib b/ui/Base.lproj/CurrentCall.xib
index 655fa8b..5b3cade 100644
--- a/ui/Base.lproj/CurrentCall.xib
+++ b/ui/Base.lproj/CurrentCall.xib
@@ -682,7 +682,7 @@
                                         <rect key="frame" x="0.0" y="0.0" width="372" height="465"/>
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                         <subviews>
-                                            <outlineView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" selectionHighlightStyle="none" autosaveColumns="NO" rowHeight="60" rowSizeStyle="automatic" viewBased="YES" indentationPerLevel="16" outlineTableColumn="nFu-qN-GHK" id="ZOj-5b-rnp">
+                                            <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" selectionHighlightStyle="none" autosaveColumns="NO" rowHeight="60" rowSizeStyle="automatic" viewBased="YES" id="ZOj-5b-rnp">
                                                 <rect key="frame" x="0.0" y="0.0" width="372" height="465"/>
                                                 <autoresizingMask key="autoresizingMask"/>
                                                 <size key="intercellSpacing" width="3" height="2"/>
@@ -786,9 +786,10 @@
                                                     </tableColumn>
                                                 </tableColumns>
                                                 <connections>
+                                                    <outlet property="dataSource" destination="loh-bZ-dDU" id="G8m-dx-6OM"/>
                                                     <outlet property="delegate" destination="loh-bZ-dDU" id="TuS-js-CeK"/>
                                                 </connections>
-                                            </outlineView>
+                                            </tableView>
                                         </subviews>
                                     </clipView>
                                     <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="zPy-Iz-oF9">