diff --git a/__tests__/__snapshots__/Storyshots.test.js.snap b/__tests__/__snapshots__/Storyshots.test.js.snap
index b9ce3568525a6d05b079c4cd83b90729d565d07e..17a49bfb110c384eff216ebb9ced4da270e0b13b 100644
--- a/__tests__/__snapshots__/Storyshots.test.js.snap
+++ b/__tests__/__snapshots__/Storyshots.test.js.snap
@@ -1156,6 +1156,47 @@ exports[`Storyshots Message list 1`] = `
     >
       View
     </View>
+    <View
+      style={
+        Object {
+          "flexDirection": "row",
+        }
+      }
+    >
+      View
+    </View>
+    <Text
+      style={
+        Array [
+          Object {
+            "fontSize": 20,
+            "fontWeight": "300",
+            "marginLeft": 10,
+            "marginTop": 30,
+          },
+          Object {
+            "marginBottom": 30,
+            "marginTop": 0,
+            "transform": Array [
+              Object {
+                "scaleY": -1,
+              },
+            ],
+          },
+        ]
+      }
+    >
+      Message with reply
+    </Text>
+    <View
+      style={
+        Object {
+          "flexDirection": "row",
+        }
+      }
+    >
+      View
+    </View>
     <Text
       style={
         Array [
diff --git a/app/containers/message/Reply.js b/app/containers/message/Reply.js
index 02632ad5e83248407409dc35fec42296fcc15720..34fec98cea90d7e75b29123563d92b0f9c6db0f7 100644
--- a/app/containers/message/Reply.js
+++ b/app/containers/message/Reply.js
@@ -23,10 +23,12 @@ const styles = StyleSheet.create({
 		padding: 15
 	},
 	authorContainer: {
+		flex: 1,
 		flexDirection: 'row',
 		alignItems: 'center'
 	},
 	author: {
+		flex: 1,
 		color: '#1d74f5',
 		fontSize: 18,
 		fontWeight: '500',
diff --git a/storybook/stories/Message.js b/storybook/stories/Message.js
index 4984e088f8c56e3b3a1afc010bda5429eac30a83..6bd0b1e8436dde8e51298db7d2f84ca3a5cbe315 100644
--- a/storybook/stories/Message.js
+++ b/storybook/stories/Message.js
@@ -231,6 +231,26 @@ export default (
 		/>
 		<Separator title='With audio' />
 
+		<Message
+			msg="I'm fine!"
+			attachments={[{
+				author_name: 'This is a long title and i\'ll break',
+				ts: date,
+				timeFormat: 'LT',
+				text: 'How are you?'
+			}]}
+		/>
+		<Message
+			msg="I'm fine!"
+			attachments={[{
+				author_name: 'rocket.cat',
+				ts: date,
+				timeFormat: 'LT',
+				text: 'How are you?'
+			}]}
+		/>
+		<Separator title='Message with reply' />
+
 		<Message
 			urls={[{
 				url: 'https://rocket.chat',