diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 13c29bbfb..42e817eca 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -2317,8 +2317,8 @@
     "message": "Friends",
     "description": "friend tab title"
   },
-  "pending": {
-    "message": "pending",
+  "pendingAcceptance": {
+    "message": "Pending Acceptance",
     "description": "Indicates that a friend request is pending"
   },
   "notFriends": {
@@ -2541,5 +2541,14 @@
   },
   "youHaveFriendRequestFrom": {
     "message": "You have friend requests from..."
+  },
+  "members": {
+    "message": "$count$ members",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "26"
+      }
+    }
   }
 }
diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js
index 075cb1692..e5ae36612 100644
--- a/js/views/conversation_view.js
+++ b/js/views/conversation_view.js
@@ -188,6 +188,7 @@
           isOnline: this.model.isOnline(),
           isArchived: this.model.get('isArchived'),
           isPublic: this.model.isPublic(),
+          isRss: this.model.isRss(),
           members,
           selectedMessages: this.model.selectedMessages,
           expirationSettingName,
diff --git a/stylesheets/_modules.scss b/stylesheets/_modules.scss
index 9fcbca397..18b2979c4 100644
--- a/stylesheets/_modules.scss
+++ b/stylesheets/_modules.scss
@@ -1458,7 +1458,6 @@
 
 .module-conversation-header__title-text {
   color: darkgrey;
-  margin-left: 1em;
 }
 
 .module-conversation-header__title-flex {
diff --git a/stylesheets/_session.scss b/stylesheets/_session.scss
index f54d9bcc2..ef2803ce9 100644
--- a/stylesheets/_session.scss
+++ b/stylesheets/_session.scss
@@ -441,6 +441,8 @@ $session_message-container-border-radius: 5px;
 .module-conversation-header__title-flex,
 .module-conversation-header__title {
   width: 100%;
+  display: flex;
+  flex-direction: column;
 
   .module-contact-name {
     width: 100%;
diff --git a/ts/components/conversation/ConversationHeader.tsx b/ts/components/conversation/ConversationHeader.tsx
index 8174ef6c8..4973b6b3f 100644
--- a/ts/components/conversation/ConversationHeader.tsx
+++ b/ts/components/conversation/ConversationHeader.tsx
@@ -37,6 +37,7 @@ interface Props {
   isGroup: boolean;
   isArchived: boolean;
   isPublic: boolean;
+  isRss: boolean;
 
   members: Array<any>;
 
@@ -127,6 +128,8 @@ export class ConversationHeader extends React.Component<Props> {
       profileName,
       isFriend,
       isGroup,
+      isRss,
+      members,
       isFriendRequestPending,
       isMe,
       name,
@@ -142,9 +145,12 @@ export class ConversationHeader extends React.Component<Props> {
 
     let text = '';
     if (isFriendRequestPending) {
-      text = `(${i18n('pending')})`;
+      text = i18n('pendingAcceptance');
     } else if (!isFriend && !isGroup) {
-      text = `(${i18n('notFriends')})`;
+      text = i18n('notFriends');
+    } else if (isGroup && !isRss && members.length > 0) {
+      const count = String(members.length);
+      text = i18n('members', [count]);
     }
 
     const textEl =
@@ -152,14 +158,22 @@ export class ConversationHeader extends React.Component<Props> {
         <span className="module-conversation-header__title-text">{text}</span>
       );
 
+    let title;
+    if (profileName) {
+      title = `${profileName} ${window.shortenPubkey(phoneNumber)}`;
+    } else {
+      if (name) {
+        title = `${name}`;
+      } else {
+        title = phoneNumber;
+      }
+    }
+
     return (
       <div className="module-conversation-header__title">
-        <ContactName
-          phoneNumber={phoneNumber}
-          profileName={profileName}
-          name={name}
-          i18n={i18n}
-        />
+        <span className="module-contact-name__profile-name">
+          {title}
+        </span>
         {textEl}
       </div>
     );