diff --git a/app/src/Chat.js b/app/src/Chat.js
index b7128d5..4de54ec 100644
--- a/app/src/Chat.js
+++ b/app/src/Chat.js
@@ -276,9 +276,6 @@ export default class Chat extends Component {
       time: new Date(),
       type: '',
     };
-    const { messages } = this.state;
-    messages.push({ ...data, type: 'pending' });
-    this.setState({ messages });
     if (this.state.gif === true) data.type = 'giphy';
     SendMessageApi(data).catch((err) => {
       this.props.notify(err.message || err.statusText);
@@ -522,9 +519,11 @@ export default class Chat extends Component {
         </div>
         <div className="text-phone-panel">
           {gif || newMessage ? null : (
-            <IconButton color="secondary" onClick={this.toggleFullscreen}>
-              {isFullscreen ? <FullscreenExit /> : <Fullscreen />}
-            </IconButton>
+            <Tooltip title="Fullscreen with Watch Party" aria-label="Fullscreen">
+              <IconButton color="secondary" onClick={this.toggleFullscreen}>
+                {isFullscreen ? <FullscreenExit /> : <Fullscreen />}
+              </IconButton>
+            </Tooltip>
           )}
           {gif || newMessage ? null : (
             <IconButton