diff --git a/package/src/components/Thread/__tests__/__snapshots__/Thread.test.js.snap b/package/src/components/Thread/__tests__/__snapshots__/Thread.test.js.snap
index cfd749cb7..8622e18f8 100644
--- a/package/src/components/Thread/__tests__/__snapshots__/Thread.test.js.snap
+++ b/package/src/components/Thread/__tests__/__snapshots__/Thread.test.js.snap
@@ -255,294 +255,290 @@ exports[`Thread should match thread snapshot 1`] = `
               testID="message-list-item-0"
             >
               <View
-                testID="message-list-item-0"
+                style={
+                  [
+                    undefined,
+                  ]
+                }
+                testID="message-wrapper"
               >
                 <View
                   style={
                     [
-                      undefined,
+                      [
+                        {
+                          "paddingHorizontal": 8,
+                        },
+                        {},
+                      ],
+                      {
+                        "backgroundColor": undefined,
+                      },
                     ]
                   }
-                  testID="message-wrapper"
                 >
                   <View
                     style={
                       [
-                        [
-                          {
-                            "paddingHorizontal": 8,
-                          },
-                          {},
-                        ],
-                        {
-                          "backgroundColor": undefined,
-                        },
+                        {},
                       ]
                     }
                   >
                     <View
                       style={
                         [
+                          {
+                            "alignItems": "flex-end",
+                            "flexDirection": "row",
+                          },
+                          [
+                            {
+                              "marginBottom": 8,
+                            },
+                            {},
+                          ],
+                          {
+                            "justifyContent": "flex-start",
+                            "marginTop": 0,
+                          },
                           {},
                         ]
                       }
+                      testID="message-simple-wrapper"
                     >
                       <View
                         style={
                           [
                             {
-                              "alignItems": "flex-end",
-                              "flexDirection": "row",
-                            },
-                            [
-                              {
-                                "marginBottom": 8,
-                              },
-                              {},
-                            ],
-                            {
-                              "justifyContent": "flex-start",
-                              "marginTop": 0,
+                              "marginRight": 8,
                             },
                             {},
                           ]
                         }
-                        testID="message-simple-wrapper"
+                        testID="message-avatar"
                       >
-                        <View
-                          style={
-                            [
-                              {
-                                "marginRight": 8,
-                              },
-                              {},
-                            ]
-                          }
-                          testID="message-avatar"
-                        >
-                          <View>
-                            <View
+                        <View>
+                          <View
+                            style={
+                              [
+                                {
+                                  "alignItems": "center",
+                                  "justifyContent": "center",
+                                  "overflow": "hidden",
+                                },
+                                {
+                                  "borderRadius": 16,
+                                  "height": 32,
+                                  "width": 32,
+                                },
+                                {},
+                                undefined,
+                              ]
+                            }
+                          >
+                            <Image
+                              accessibilityLabel="Avatar Image"
+                              onError={[Function]}
+                              source={
+                                {
+                                  "uri": "https://i.imgur.com/LuuGvh0.png",
+                                }
+                              }
                               style={
                                 [
                                   {
-                                    "alignItems": "center",
-                                    "justifyContent": "center",
-                                    "overflow": "hidden",
+                                    "borderRadius": 16,
+                                    "height": 32,
+                                    "width": 32,
                                   },
                                   {
+                                    "backgroundColor": "#ececec",
                                     "borderRadius": 16,
                                     "height": 32,
                                     "width": 32,
                                   },
-                                  {},
                                   undefined,
                                 ]
                               }
-                            >
-                              <Image
-                                accessibilityLabel="Avatar Image"
-                                onError={[Function]}
-                                source={
-                                  {
-                                    "uri": "https://i.imgur.com/LuuGvh0.png",
-                                  }
-                                }
-                                style={
-                                  [
-                                    {
-                                      "borderRadius": 16,
-                                      "height": 32,
-                                      "width": 32,
-                                    },
-                                    {
-                                      "backgroundColor": "#ececec",
-                                      "borderRadius": 16,
-                                      "height": 32,
-                                      "width": 32,
-                                    },
-                                    undefined,
-                                  ]
-                                }
-                                testID="avatar-image"
-                              />
-                            </View>
+                              testID="avatar-image"
+                            />
                           </View>
                         </View>
-                        <View
-                          accessibilityState={
-                            {
-                              "busy": undefined,
-                              "checked": undefined,
-                              "disabled": undefined,
-                              "expanded": undefined,
-                              "selected": undefined,
-                            }
+                      </View>
+                      <View
+                        accessibilityState={
+                          {
+                            "busy": undefined,
+                            "checked": undefined,
+                            "disabled": undefined,
+                            "expanded": undefined,
+                            "selected": undefined,
                           }
-                          accessibilityValue={
-                            {
-                              "max": undefined,
-                              "min": undefined,
-                              "now": undefined,
-                              "text": undefined,
-                            }
+                        }
+                        accessibilityValue={
+                          {
+                            "max": undefined,
+                            "min": undefined,
+                            "now": undefined,
+                            "text": undefined,
                           }
-                          accessible={true}
-                          collapsable={false}
-                          focusable={true}
-                          onClick={[Function]}
-                          onResponderGrant={[Function]}
-                          onResponderMove={[Function]}
-                          onResponderRelease={[Function]}
-                          onResponderTerminate={[Function]}
-                          onResponderTerminationRequest={[Function]}
-                          onStartShouldSetResponder={[Function]}
-                          style={
-                            {
-                              "alignItems": "flex-start",
-                              "opacity": 1,
-                              "paddingTop": 2,
-                            }
+                        }
+                        accessible={true}
+                        collapsable={false}
+                        focusable={true}
+                        onClick={[Function]}
+                        onResponderGrant={[Function]}
+                        onResponderMove={[Function]}
+                        onResponderRelease={[Function]}
+                        onResponderTerminate={[Function]}
+                        onResponderTerminationRequest={[Function]}
+                        onStartShouldSetResponder={[Function]}
+                        style={
+                          {
+                            "alignItems": "flex-start",
+                            "opacity": 1,
+                            "paddingTop": 2,
                           }
-                          testID="message-content"
+                        }
+                        testID="message-content"
+                      >
+                        <View
+                          onLayout={[Function]}
+                          style={{}}
                         >
                           <View
-                            onLayout={[Function]}
-                            style={{}}
+                            style={
+                              [
+                                {
+                                  "borderTopLeftRadius": 16,
+                                  "borderTopRightRadius": 16,
+                                  "borderWidth": 1,
+                                  "overflow": "hidden",
+                                },
+                                {
+                                  "backgroundColor": "#FCFCFC",
+                                  "borderBottomLeftRadius": 0,
+                                  "borderBottomRightRadius": 16,
+                                  "borderColor": "#ECEBEB",
+                                },
+                                {},
+                                {},
+                              ]
+                            }
+                            testID="message-content-wrapper"
                           >
                             <View
                               style={
                                 [
                                   {
-                                    "borderTopLeftRadius": 16,
-                                    "borderTopRightRadius": 16,
-                                    "borderWidth": 1,
-                                    "overflow": "hidden",
-                                  },
-                                  {
-                                    "backgroundColor": "#FCFCFC",
-                                    "borderBottomLeftRadius": 0,
-                                    "borderBottomRightRadius": 16,
-                                    "borderColor": "#ECEBEB",
+                                    "maxWidth": 250,
+                                    "paddingHorizontal": 16,
                                   },
                                   {},
-                                  {},
+                                  undefined,
                                 ]
                               }
-                              testID="message-content-wrapper"
+                              testID="message-text-container"
                             >
                               <View
                                 style={
                                   [
                                     {
-                                      "maxWidth": 250,
-                                      "paddingHorizontal": 16,
+                                      "alignSelf": "stretch",
                                     },
-                                    {},
                                     undefined,
                                   ]
                                 }
-                                testID="message-text-container"
                               >
-                                <View
+                                <Text
                                   style={
-                                    [
-                                      {
-                                        "alignSelf": "stretch",
-                                      },
-                                      undefined,
-                                    ]
+                                    {
+                                      "alignItems": "flex-start",
+                                      "flexDirection": "row",
+                                      "flexWrap": "wrap",
+                                      "justifyContent": "flex-start",
+                                      "marginBottom": 8,
+                                      "marginTop": 8,
+                                    }
                                   }
                                 >
                                   <Text
                                     style={
                                       {
-                                        "alignItems": "flex-start",
-                                        "flexDirection": "row",
-                                        "flexWrap": "wrap",
-                                        "justifyContent": "flex-start",
-                                        "marginBottom": 8,
-                                        "marginTop": 8,
+                                        "color": "#000000",
                                       }
                                     }
                                   >
-                                    <Text
-                                      style={
-                                        {
-                                          "color": "#000000",
-                                        }
-                                      }
-                                    >
-                                      Message6
-                                    </Text>
+                                    Message6
                                   </Text>
-                                </View>
+                                </Text>
                               </View>
                             </View>
                           </View>
-                          <View
+                        </View>
+                        <View
+                          style={
+                            [
+                              {
+                                "alignItems": "center",
+                                "flexDirection": "row",
+                                "justifyContent": "center",
+                                "marginTop": 4,
+                              },
+                              {},
+                            ]
+                          }
+                          testID="message-status-time"
+                        >
+                          <Text
                             style={
                               [
                                 {
-                                  "alignItems": "center",
-                                  "flexDirection": "row",
-                                  "justifyContent": "center",
-                                  "marginTop": 4,
+                                  "fontSize": 12,
+                                },
+                                {
+                                  "color": "#7A7A7A",
                                 },
                                 {},
                               ]
                             }
-                            testID="message-status-time"
                           >
-                            <Text
-                              style={
-                                [
-                                  {
-                                    "fontSize": 12,
-                                  },
-                                  {
-                                    "color": "#7A7A7A",
-                                  },
-                                  {},
-                                ]
-                              }
-                            >
-                              2:50 PM
-                            </Text>
-                            <Text
-                              style={
-                                [
-                                  {
-                                    "paddingHorizontal": 4,
-                                  },
-                                  {
-                                    "color": "#7A7A7A",
-                                    "textAlign": "left",
-                                  },
-                                  {
-                                    "fontSize": 12,
-                                  },
-                                ]
-                              }
-                            >
-                              ⦁
-                            </Text>
-                            <Text
-                              style={
-                                [
-                                  {
-                                    "fontSize": 12,
-                                  },
-                                  {
-                                    "color": "#7A7A7A",
-                                    "textAlign": "left",
-                                  },
-                                  {},
-                                ]
-                              }
-                            >
-                              Edited
-                            </Text>
-                          </View>
+                            2:50 PM
+                          </Text>
+                          <Text
+                            style={
+                              [
+                                {
+                                  "paddingHorizontal": 4,
+                                },
+                                {
+                                  "color": "#7A7A7A",
+                                  "textAlign": "left",
+                                },
+                                {
+                                  "fontSize": 12,
+                                },
+                              ]
+                            }
+                          >
+                            ⦁
+                          </Text>
+                          <Text
+                            style={
+                              [
+                                {
+                                  "fontSize": 12,
+                                },
+                                {
+                                  "color": "#7A7A7A",
+                                  "textAlign": "left",
+                                },
+                                {},
+                              ]
+                            }
+                          >
+                            Edited
+                          </Text>
                         </View>
                       </View>
                     </View>
@@ -585,294 +581,290 @@ exports[`Thread should match thread snapshot 1`] = `
               testID="message-list-item-1"
             >
               <View
-                testID="message-list-item-1"
+                style={
+                  [
+                    undefined,
+                  ]
+                }
+                testID="message-wrapper"
               >
                 <View
                   style={
                     [
-                      undefined,
+                      [
+                        {
+                          "paddingHorizontal": 8,
+                        },
+                        {},
+                      ],
+                      {
+                        "backgroundColor": undefined,
+                      },
                     ]
                   }
-                  testID="message-wrapper"
                 >
                   <View
                     style={
                       [
-                        [
-                          {
-                            "paddingHorizontal": 8,
-                          },
-                          {},
-                        ],
-                        {
-                          "backgroundColor": undefined,
-                        },
+                        {},
                       ]
                     }
                   >
                     <View
                       style={
                         [
+                          {
+                            "alignItems": "flex-end",
+                            "flexDirection": "row",
+                          },
+                          [
+                            {
+                              "marginBottom": 8,
+                            },
+                            {},
+                          ],
+                          {
+                            "justifyContent": "flex-start",
+                            "marginTop": 0,
+                          },
                           {},
                         ]
                       }
+                      testID="message-simple-wrapper"
                     >
                       <View
                         style={
                           [
                             {
-                              "alignItems": "flex-end",
-                              "flexDirection": "row",
-                            },
-                            [
-                              {
-                                "marginBottom": 8,
-                              },
-                              {},
-                            ],
-                            {
-                              "justifyContent": "flex-start",
-                              "marginTop": 0,
+                              "marginRight": 8,
                             },
                             {},
                           ]
                         }
-                        testID="message-simple-wrapper"
+                        testID="message-avatar"
                       >
-                        <View
-                          style={
-                            [
-                              {
-                                "marginRight": 8,
-                              },
-                              {},
-                            ]
-                          }
-                          testID="message-avatar"
-                        >
-                          <View>
-                            <View
-                              style={
-                                [
-                                  {
-                                    "alignItems": "center",
-                                    "justifyContent": "center",
-                                    "overflow": "hidden",
-                                  },
-                                  {
-                                    "borderRadius": 16,
-                                    "height": 32,
-                                    "width": 32,
-                                  },
-                                  {},
-                                  undefined,
-                                ]
+                        <View>
+                          <View
+                            style={
+                              [
+                                {
+                                  "alignItems": "center",
+                                  "justifyContent": "center",
+                                  "overflow": "hidden",
+                                },
+                                {
+                                  "borderRadius": 16,
+                                  "height": 32,
+                                  "width": 32,
+                                },
+                                {},
+                                undefined,
+                              ]
+                            }
+                          >
+                            <Image
+                              accessibilityLabel="Avatar Image"
+                              onError={[Function]}
+                              source={
+                                {
+                                  "uri": "https://i.imgur.com/spueyAP.png",
+                                }
                               }
-                            >
-                              <Image
-                                accessibilityLabel="Avatar Image"
-                                onError={[Function]}
-                                source={
+                              style={
+                                [
                                   {
-                                    "uri": "https://i.imgur.com/spueyAP.png",
-                                  }
-                                }
-                                style={
-                                  [
-                                    {
-                                      "borderRadius": 16,
-                                      "height": 32,
-                                      "width": 32,
-                                    },
-                                    {
-                                      "backgroundColor": "#ececec",
-                                      "borderRadius": 16,
-                                      "height": 32,
-                                      "width": 32,
-                                    },
-                                    undefined,
-                                  ]
-                                }
-                                testID="avatar-image"
-                              />
-                            </View>
+                                    "borderRadius": 16,
+                                    "height": 32,
+                                    "width": 32,
+                                  },
+                                  {
+                                    "backgroundColor": "#ececec",
+                                    "borderRadius": 16,
+                                    "height": 32,
+                                    "width": 32,
+                                  },
+                                  undefined,
+                                ]
+                              }
+                              testID="avatar-image"
+                            />
                           </View>
                         </View>
-                        <View
-                          accessibilityState={
-                            {
-                              "busy": undefined,
-                              "checked": undefined,
-                              "disabled": undefined,
-                              "expanded": undefined,
-                              "selected": undefined,
-                            }
+                      </View>
+                      <View
+                        accessibilityState={
+                          {
+                            "busy": undefined,
+                            "checked": undefined,
+                            "disabled": undefined,
+                            "expanded": undefined,
+                            "selected": undefined,
                           }
-                          accessibilityValue={
-                            {
-                              "max": undefined,
-                              "min": undefined,
-                              "now": undefined,
-                              "text": undefined,
-                            }
+                        }
+                        accessibilityValue={
+                          {
+                            "max": undefined,
+                            "min": undefined,
+                            "now": undefined,
+                            "text": undefined,
                           }
-                          accessible={true}
-                          collapsable={false}
-                          focusable={true}
-                          onClick={[Function]}
-                          onResponderGrant={[Function]}
-                          onResponderMove={[Function]}
-                          onResponderRelease={[Function]}
-                          onResponderTerminate={[Function]}
-                          onResponderTerminationRequest={[Function]}
-                          onStartShouldSetResponder={[Function]}
-                          style={
-                            {
-                              "alignItems": "flex-start",
-                              "opacity": 1,
-                              "paddingTop": 2,
-                            }
+                        }
+                        accessible={true}
+                        collapsable={false}
+                        focusable={true}
+                        onClick={[Function]}
+                        onResponderGrant={[Function]}
+                        onResponderMove={[Function]}
+                        onResponderRelease={[Function]}
+                        onResponderTerminate={[Function]}
+                        onResponderTerminationRequest={[Function]}
+                        onStartShouldSetResponder={[Function]}
+                        style={
+                          {
+                            "alignItems": "flex-start",
+                            "opacity": 1,
+                            "paddingTop": 2,
                           }
-                          testID="message-content"
+                        }
+                        testID="message-content"
+                      >
+                        <View
+                          onLayout={[Function]}
+                          style={{}}
                         >
                           <View
-                            onLayout={[Function]}
-                            style={{}}
+                            style={
+                              [
+                                {
+                                  "borderTopLeftRadius": 16,
+                                  "borderTopRightRadius": 16,
+                                  "borderWidth": 1,
+                                  "overflow": "hidden",
+                                },
+                                {
+                                  "backgroundColor": "#FCFCFC",
+                                  "borderBottomLeftRadius": 0,
+                                  "borderBottomRightRadius": 16,
+                                  "borderColor": "#ECEBEB",
+                                },
+                                {},
+                                {},
+                              ]
+                            }
+                            testID="message-content-wrapper"
                           >
                             <View
                               style={
                                 [
                                   {
-                                    "borderTopLeftRadius": 16,
-                                    "borderTopRightRadius": 16,
-                                    "borderWidth": 1,
-                                    "overflow": "hidden",
-                                  },
-                                  {
-                                    "backgroundColor": "#FCFCFC",
-                                    "borderBottomLeftRadius": 0,
-                                    "borderBottomRightRadius": 16,
-                                    "borderColor": "#ECEBEB",
+                                    "maxWidth": 250,
+                                    "paddingHorizontal": 16,
                                   },
                                   {},
-                                  {},
+                                  undefined,
                                 ]
                               }
-                              testID="message-content-wrapper"
+                              testID="message-text-container"
                             >
                               <View
                                 style={
                                   [
                                     {
-                                      "maxWidth": 250,
-                                      "paddingHorizontal": 16,
+                                      "alignSelf": "stretch",
                                     },
-                                    {},
                                     undefined,
                                   ]
                                 }
-                                testID="message-text-container"
                               >
-                                <View
+                                <Text
                                   style={
-                                    [
-                                      {
-                                        "alignSelf": "stretch",
-                                      },
-                                      undefined,
-                                    ]
+                                    {
+                                      "alignItems": "flex-start",
+                                      "flexDirection": "row",
+                                      "flexWrap": "wrap",
+                                      "justifyContent": "flex-start",
+                                      "marginBottom": 8,
+                                      "marginTop": 8,
+                                    }
                                   }
                                 >
                                   <Text
                                     style={
                                       {
-                                        "alignItems": "flex-start",
-                                        "flexDirection": "row",
-                                        "flexWrap": "wrap",
-                                        "justifyContent": "flex-start",
-                                        "marginBottom": 8,
-                                        "marginTop": 8,
+                                        "color": "#000000",
                                       }
                                     }
                                   >
-                                    <Text
-                                      style={
-                                        {
-                                          "color": "#000000",
-                                        }
-                                      }
-                                    >
-                                      Message5
-                                    </Text>
+                                    Message5
                                   </Text>
-                                </View>
+                                </Text>
                               </View>
                             </View>
                           </View>
-                          <View
+                        </View>
+                        <View
+                          style={
+                            [
+                              {
+                                "alignItems": "center",
+                                "flexDirection": "row",
+                                "justifyContent": "center",
+                                "marginTop": 4,
+                              },
+                              {},
+                            ]
+                          }
+                          testID="message-status-time"
+                        >
+                          <Text
                             style={
                               [
                                 {
-                                  "alignItems": "center",
-                                  "flexDirection": "row",
-                                  "justifyContent": "center",
-                                  "marginTop": 4,
+                                  "fontSize": 12,
+                                },
+                                {
+                                  "color": "#7A7A7A",
                                 },
                                 {},
                               ]
                             }
-                            testID="message-status-time"
                           >
-                            <Text
-                              style={
-                                [
-                                  {
-                                    "fontSize": 12,
-                                  },
-                                  {
-                                    "color": "#7A7A7A",
-                                  },
-                                  {},
-                                ]
-                              }
-                            >
-                              2:50 PM
-                            </Text>
-                            <Text
-                              style={
-                                [
-                                  {
-                                    "paddingHorizontal": 4,
-                                  },
-                                  {
-                                    "color": "#7A7A7A",
-                                    "textAlign": "left",
-                                  },
-                                  {
-                                    "fontSize": 12,
-                                  },
-                                ]
-                              }
-                            >
-                              ⦁
-                            </Text>
-                            <Text
-                              style={
-                                [
-                                  {
-                                    "fontSize": 12,
-                                  },
-                                  {
-                                    "color": "#7A7A7A",
-                                    "textAlign": "left",
-                                  },
-                                  {},
-                                ]
-                              }
-                            >
-                              Edited
-                            </Text>
-                          </View>
+                            2:50 PM
+                          </Text>
+                          <Text
+                            style={
+                              [
+                                {
+                                  "paddingHorizontal": 4,
+                                },
+                                {
+                                  "color": "#7A7A7A",
+                                  "textAlign": "left",
+                                },
+                                {
+                                  "fontSize": 12,
+                                },
+                              ]
+                            }
+                          >
+                            ⦁
+                          </Text>
+                          <Text
+                            style={
+                              [
+                                {
+                                  "fontSize": 12,
+                                },
+                                {
+                                  "color": "#7A7A7A",
+                                  "textAlign": "left",
+                                },
+                                {},
+                              ]
+                            }
+                          >
+                            Edited
+                          </Text>
                         </View>
                       </View>
                     </View>
@@ -915,332 +907,290 @@ exports[`Thread should match thread snapshot 1`] = `
               testID="message-list-item-2"
             >
               <View
-                testID="message-list-item-2"
+                style={
+                  [
+                    undefined,
+                  ]
+                }
+                testID="message-wrapper"
               >
                 <View
                   style={
                     [
-                      {
-                        "alignItems": "center",
-                        "alignSelf": "center",
-                        "borderRadius": 8,
-                        "height": 16,
-                        "justifyContent": "center",
-                        "marginVertical": 4,
-                        "paddingHorizontal": 8,
-                      },
-                      {
-                        "backgroundColor": "#000000CC",
-                      },
-                      {},
-                    ]
-                  }
-                  testID="date-separator"
-                >
-                  <Text
-                    style={
                       [
                         {
-                          "fontSize": 12,
-                          "textAlign": "center",
-                          "textAlignVertical": "center",
-                        },
-                        {
-                          "color": "#FFFFFF",
+                          "paddingHorizontal": 8,
                         },
                         {},
-                      ]
-                    }
-                  >
-                    05/05/2020
-                  </Text>
-                </View>
-                <View
-                  style={
-                    [
-                      undefined,
+                      ],
+                      {
+                        "backgroundColor": undefined,
+                      },
                     ]
                   }
-                  testID="message-wrapper"
                 >
                   <View
                     style={
                       [
-                        [
-                          {
-                            "paddingHorizontal": 8,
-                          },
-                          {},
-                        ],
-                        {
-                          "backgroundColor": undefined,
-                        },
+                        {},
                       ]
                     }
                   >
                     <View
                       style={
                         [
+                          {
+                            "alignItems": "flex-end",
+                            "flexDirection": "row",
+                          },
+                          [
+                            {
+                              "marginBottom": 8,
+                            },
+                            {},
+                          ],
+                          {
+                            "justifyContent": "flex-start",
+                            "marginTop": 0,
+                          },
                           {},
                         ]
                       }
+                      testID="message-simple-wrapper"
                     >
                       <View
                         style={
                           [
                             {
-                              "alignItems": "flex-end",
-                              "flexDirection": "row",
-                            },
-                            [
-                              {
-                                "marginBottom": 8,
-                              },
-                              {},
-                            ],
-                            {
-                              "justifyContent": "flex-start",
-                              "marginTop": 0,
+                              "marginRight": 8,
                             },
                             {},
                           ]
                         }
-                        testID="message-simple-wrapper"
+                        testID="message-avatar"
                       >
-                        <View
-                          style={
-                            [
-                              {
-                                "marginRight": 8,
-                              },
-                              {},
-                            ]
-                          }
-                          testID="message-avatar"
-                        >
-                          <View>
-                            <View
+                        <View>
+                          <View
+                            style={
+                              [
+                                {
+                                  "alignItems": "center",
+                                  "justifyContent": "center",
+                                  "overflow": "hidden",
+                                },
+                                {
+                                  "borderRadius": 16,
+                                  "height": 32,
+                                  "width": 32,
+                                },
+                                {},
+                                undefined,
+                              ]
+                            }
+                          >
+                            <Image
+                              accessibilityLabel="Avatar Image"
+                              onError={[Function]}
+                              source={
+                                {
+                                  "uri": "https://i.imgur.com/LuuGvh0.png",
+                                }
+                              }
                               style={
                                 [
                                   {
-                                    "alignItems": "center",
-                                    "justifyContent": "center",
-                                    "overflow": "hidden",
+                                    "borderRadius": 16,
+                                    "height": 32,
+                                    "width": 32,
                                   },
                                   {
+                                    "backgroundColor": "#ececec",
                                     "borderRadius": 16,
                                     "height": 32,
                                     "width": 32,
                                   },
-                                  {},
                                   undefined,
                                 ]
                               }
-                            >
-                              <Image
-                                accessibilityLabel="Avatar Image"
-                                onError={[Function]}
-                                source={
-                                  {
-                                    "uri": "https://i.imgur.com/LuuGvh0.png",
-                                  }
-                                }
-                                style={
-                                  [
-                                    {
-                                      "borderRadius": 16,
-                                      "height": 32,
-                                      "width": 32,
-                                    },
-                                    {
-                                      "backgroundColor": "#ececec",
-                                      "borderRadius": 16,
-                                      "height": 32,
-                                      "width": 32,
-                                    },
-                                    undefined,
-                                  ]
-                                }
-                                testID="avatar-image"
-                              />
-                            </View>
+                              testID="avatar-image"
+                            />
                           </View>
                         </View>
-                        <View
-                          accessibilityState={
-                            {
-                              "busy": undefined,
-                              "checked": undefined,
-                              "disabled": undefined,
-                              "expanded": undefined,
-                              "selected": undefined,
-                            }
+                      </View>
+                      <View
+                        accessibilityState={
+                          {
+                            "busy": undefined,
+                            "checked": undefined,
+                            "disabled": undefined,
+                            "expanded": undefined,
+                            "selected": undefined,
                           }
-                          accessibilityValue={
-                            {
-                              "max": undefined,
-                              "min": undefined,
-                              "now": undefined,
-                              "text": undefined,
-                            }
+                        }
+                        accessibilityValue={
+                          {
+                            "max": undefined,
+                            "min": undefined,
+                            "now": undefined,
+                            "text": undefined,
                           }
-                          accessible={true}
-                          collapsable={false}
-                          focusable={true}
-                          onClick={[Function]}
-                          onResponderGrant={[Function]}
-                          onResponderMove={[Function]}
-                          onResponderRelease={[Function]}
-                          onResponderTerminate={[Function]}
-                          onResponderTerminationRequest={[Function]}
-                          onStartShouldSetResponder={[Function]}
-                          style={
-                            {
-                              "alignItems": "flex-start",
-                              "opacity": 1,
-                              "paddingTop": 2,
-                            }
+                        }
+                        accessible={true}
+                        collapsable={false}
+                        focusable={true}
+                        onClick={[Function]}
+                        onResponderGrant={[Function]}
+                        onResponderMove={[Function]}
+                        onResponderRelease={[Function]}
+                        onResponderTerminate={[Function]}
+                        onResponderTerminationRequest={[Function]}
+                        onStartShouldSetResponder={[Function]}
+                        style={
+                          {
+                            "alignItems": "flex-start",
+                            "opacity": 1,
+                            "paddingTop": 2,
                           }
-                          testID="message-content"
+                        }
+                        testID="message-content"
+                      >
+                        <View
+                          onLayout={[Function]}
+                          style={{}}
                         >
                           <View
-                            onLayout={[Function]}
-                            style={{}}
+                            style={
+                              [
+                                {
+                                  "borderTopLeftRadius": 16,
+                                  "borderTopRightRadius": 16,
+                                  "borderWidth": 1,
+                                  "overflow": "hidden",
+                                },
+                                {
+                                  "backgroundColor": "#FCFCFC",
+                                  "borderBottomLeftRadius": 0,
+                                  "borderBottomRightRadius": 16,
+                                  "borderColor": "#ECEBEB",
+                                },
+                                {},
+                                {},
+                              ]
+                            }
+                            testID="message-content-wrapper"
                           >
                             <View
                               style={
                                 [
                                   {
-                                    "borderTopLeftRadius": 16,
-                                    "borderTopRightRadius": 16,
-                                    "borderWidth": 1,
-                                    "overflow": "hidden",
-                                  },
-                                  {
-                                    "backgroundColor": "#FCFCFC",
-                                    "borderBottomLeftRadius": 0,
-                                    "borderBottomRightRadius": 16,
-                                    "borderColor": "#ECEBEB",
+                                    "maxWidth": 250,
+                                    "paddingHorizontal": 16,
                                   },
                                   {},
-                                  {},
+                                  undefined,
                                 ]
                               }
-                              testID="message-content-wrapper"
+                              testID="message-text-container"
                             >
                               <View
                                 style={
                                   [
                                     {
-                                      "maxWidth": 250,
-                                      "paddingHorizontal": 16,
+                                      "alignSelf": "stretch",
                                     },
-                                    {},
                                     undefined,
                                   ]
                                 }
-                                testID="message-text-container"
                               >
-                                <View
+                                <Text
                                   style={
-                                    [
-                                      {
-                                        "alignSelf": "stretch",
-                                      },
-                                      undefined,
-                                    ]
+                                    {
+                                      "alignItems": "flex-start",
+                                      "flexDirection": "row",
+                                      "flexWrap": "wrap",
+                                      "justifyContent": "flex-start",
+                                      "marginBottom": 8,
+                                      "marginTop": 8,
+                                    }
                                   }
                                 >
                                   <Text
                                     style={
                                       {
-                                        "alignItems": "flex-start",
-                                        "flexDirection": "row",
-                                        "flexWrap": "wrap",
-                                        "justifyContent": "flex-start",
-                                        "marginBottom": 8,
-                                        "marginTop": 8,
+                                        "color": "#000000",
                                       }
                                     }
                                   >
-                                    <Text
-                                      style={
-                                        {
-                                          "color": "#000000",
-                                        }
-                                      }
-                                    >
-                                      Message4
-                                    </Text>
+                                    Message4
                                   </Text>
-                                </View>
+                                </Text>
                               </View>
                             </View>
                           </View>
-                          <View
+                        </View>
+                        <View
+                          style={
+                            [
+                              {
+                                "alignItems": "center",
+                                "flexDirection": "row",
+                                "justifyContent": "center",
+                                "marginTop": 4,
+                              },
+                              {},
+                            ]
+                          }
+                          testID="message-status-time"
+                        >
+                          <Text
                             style={
                               [
                                 {
-                                  "alignItems": "center",
-                                  "flexDirection": "row",
-                                  "justifyContent": "center",
-                                  "marginTop": 4,
+                                  "fontSize": 12,
+                                },
+                                {
+                                  "color": "#7A7A7A",
                                 },
                                 {},
                               ]
                             }
-                            testID="message-status-time"
                           >
-                            <Text
-                              style={
-                                [
-                                  {
-                                    "fontSize": 12,
-                                  },
-                                  {
-                                    "color": "#7A7A7A",
-                                  },
-                                  {},
-                                ]
-                              }
-                            >
-                              2:50 PM
-                            </Text>
-                            <Text
-                              style={
-                                [
-                                  {
-                                    "paddingHorizontal": 4,
-                                  },
-                                  {
-                                    "color": "#7A7A7A",
-                                    "textAlign": "left",
-                                  },
-                                  {
-                                    "fontSize": 12,
-                                  },
-                                ]
-                              }
-                            >
-                              ⦁
-                            </Text>
-                            <Text
-                              style={
-                                [
-                                  {
-                                    "fontSize": 12,
-                                  },
-                                  {
-                                    "color": "#7A7A7A",
-                                    "textAlign": "left",
-                                  },
-                                  {},
-                                ]
-                              }
-                            >
-                              Edited
-                            </Text>
-                          </View>
+                            2:50 PM
+                          </Text>
+                          <Text
+                            style={
+                              [
+                                {
+                                  "paddingHorizontal": 4,
+                                },
+                                {
+                                  "color": "#7A7A7A",
+                                  "textAlign": "left",
+                                },
+                                {
+                                  "fontSize": 12,
+                                },
+                              ]
+                            }
+                          >
+                            ⦁
+                          </Text>
+                          <Text
+                            style={
+                              [
+                                {
+                                  "fontSize": 12,
+                                },
+                                {
+                                  "color": "#7A7A7A",
+                                  "textAlign": "left",
+                                },
+                                {},
+                              ]
+                            }
+                          >
+                            Edited
+                          </Text>
                         </View>
                       </View>
                     </View>
@@ -1248,6 +1198,44 @@ exports[`Thread should match thread snapshot 1`] = `
                 </View>
               </View>
             </View>
+            <View
+              style={
+                [
+                  {
+                    "alignItems": "center",
+                    "alignSelf": "center",
+                    "borderRadius": 8,
+                    "height": 16,
+                    "justifyContent": "center",
+                    "marginVertical": 4,
+                    "paddingHorizontal": 8,
+                  },
+                  {
+                    "backgroundColor": "#000000CC",
+                  },
+                  {},
+                ]
+              }
+              testID="date-separator"
+            >
+              <Text
+                style={
+                  [
+                    {
+                      "fontSize": 12,
+                      "textAlign": "center",
+                      "textAlignVertical": "center",
+                    },
+                    {
+                      "color": "#FFFFFF",
+                    },
+                    {},
+                  ]
+                }
+              >
+                05/05/2020
+              </Text>
+            </View>
           </View>
           <View
             onLayout={[Function]}