diff --git a/App/Components/message.tsx b/App/Components/message.tsx
index 95abd7e22..55c04d137 100644
--- a/App/Components/message.tsx
+++ b/App/Components/message.tsx
@@ -53,18 +53,22 @@ export interface Props {
   message?: string
   time: string
   containerStyle?: ViewStyle
+  isSameUser?: boolean
 }
 
 const Message = (props: Props) => {
   const alignItems = props.message ? 'flex-start' : 'center'
   return (
-    <View style={[CONTAINER(alignItems), props.containerStyle]}>
-      <Avatar style={AVATAR} target={props.avatar} />
+    <View style={[CONTAINER(alignItems), props.containerStyle, props.isSameUser && {paddingTop: 0}]}>
+      {props.isSameUser && <View style={AVATAR} />}
+      {!props.isSameUser && <Avatar style={AVATAR} target={props.avatar} />}
       <View style={CONTENT}>
-        <View style={META}>
-          <Text style={USERNAME}>{props.username}</Text>
-          <Text style={TIME}>{props.time.toUpperCase()}</Text>
-        </View>
+        {!props.isSameUser &&
+          <View style={META}>
+            <Text style={USERNAME}>{props.username}</Text>
+            <Text style={TIME}>{props.time.toUpperCase()}</Text>
+          </View>
+        }
         {props.message &&
           <Text style={MESSAGE}>{props.message}</Text>
         }
diff --git a/App/screens/group/group.tsx b/App/screens/group/group.tsx
index 9237becf6..5dea57480 100644
--- a/App/screens/group/group.tsx
+++ b/App/screens/group/group.tsx
@@ -24,6 +24,7 @@ import UIActions from '../../Redux/UIRedux'
 import PhotoViewingActions from '../../Redux/PhotoViewingRedux'
 import { CommentData } from '../../Components/comments'
 import { color } from '../../styles'
+import { pb } from '@textile/react-native-sdk'
 
 const momentSpec: moment.CalendarSpec = {
   sameDay: 'LT',
@@ -137,7 +138,21 @@ class Group extends Component<Props, State> {
     )
   }
 
-  renderRow = ({ item }: ListRenderItemInfo<Item>) => {
+  sameUserAgain = (user: pb.IUser, previous: Item): boolean => {
+    if (!previous || !previous.type) {
+      return false
+    }
+    switch (previous.type) {
+      case 'message': {
+        return user.address === previous.data.user.address
+      }
+      default: {
+        return false
+      }
+    }
+  }
+
+  renderRow = ({ item, index }: ListRenderItemInfo<Item>) => {
     switch (item.type) {
       case 'photo': {
         const { user, caption, date, target, files, likes, comments, block } = item.data
@@ -181,13 +196,16 @@ class Group extends Component<Props, State> {
       }
       case 'message': {
         const { user, body, date } = item.data
+        const isSameUser = this.sameUserAgain(user, this.props.items[(index + 1)])
+        const avatar = isSameUser ? undefined : user.avatar
         return (
           <Message
-            avatar={user.avatar}
+            avatar={avatar}
             username={user.name || 'unknown'}
             message={body}
             // TODO: deal with pb Timestamp to JS Date!
             time={moment(util.timestampToDate(date)).calendar(undefined, momentSpec)}
+            isSameUser={isSameUser}
           />
         )
       }