diff --git a/ts/components/conversation/ConversationHeader.tsx b/ts/components/conversation/ConversationHeader.tsx
index 3b3d33bbb..1aae3bb6a 100644
--- a/ts/components/conversation/ConversationHeader.tsx
+++ b/ts/components/conversation/ConversationHeader.tsx
@@ -255,6 +255,19 @@ export class ConversationHeader extends React.Component<Props> {
     );
   }
 
+  public renderSearch() {	
+    return (	
+      <div className="search-icon">	
+        <SessionIconButton	
+          iconType={SessionIconType.Search}	
+          iconSize={SessionIconSize.Large}	
+          iconPadded={true}	
+          onClick={this.highlightMessageSearch}	
+        />	
+      </div>	
+    );	
+  }
+
   public renderOptions(triggerId: string) {
     const { showBackButton } = this.props;
 
@@ -385,6 +398,12 @@ export class ConversationHeader extends React.Component<Props> {
             </div>
           </div>
           {this.renderExpirationLength()}
+          
+          {!this.props.isRss && (
+            <>	
+              {this.renderAvatar()}	
+            </>	
+          )}
 
           {!this.props.isRss && this.renderAvatar()}
 
@@ -400,6 +419,12 @@ export class ConversationHeader extends React.Component<Props> {
     }
   }
 
+  public highlightMessageSearch() {	
+    // This is a temporary fix. In future we want to search	
+    // messages in the current conversation	
+    $('.session-search-input input').focus();	
+  }
+
   private renderPublicMenuItems() {
     const {
       i18n,