diff --git a/src/pages/home/report/ReportActionItem.js b/src/pages/home/report/ReportActionItem.js
index f672b08dce3a..9e995a297153 100644
--- a/src/pages/home/report/ReportActionItem.js
+++ b/src/pages/home/report/ReportActionItem.js
@@ -157,6 +157,10 @@ class ReportActionItem extends Component {
                 />
             );
         } else {
+            const message = _.last(lodashGet(this.props.action, 'message', [{}]));
+            const isAttachment = _.has(this.props.action, 'isAttachment')
+                ? this.props.action.isAttachment
+                : ReportUtils.isReportMessageAttachment(message);
             children = (
                 <ShowContextMenuContext.Provider
                     value={{
@@ -168,7 +172,10 @@ class ReportActionItem extends Component {
                 >
                     {!this.props.draftMessage
                         ? (
-                            <ReportActionItemMessage action={this.props.action} />
+                            <ReportActionItemMessage
+                                action={this.props.action}
+                                style={(!this.props.displayAsGroup && isAttachment) ? [styles.mt2] : undefined}
+                            />
                         ) : (
                             <ReportActionItemMessageEdit
                                 action={this.props.action}
diff --git a/src/styles/styles.js b/src/styles/styles.js
index 21b2215f8973..4b1d1982ae5d 100644
--- a/src/styles/styles.js
+++ b/src/styles/styles.js
@@ -1320,7 +1320,6 @@ const styles = {
         fontSize: variables.fontSizeNormal,
         fontWeight: fontWeightBold,
         lineHeight: variables.lineHeightXLarge,
-        paddingBottom: 4,
         ...wordBreak.breakWord,
     },
 
@@ -1328,8 +1327,7 @@ const styles = {
         flexShrink: 0,
         color: themeColors.textSupporting,
         fontSize: variables.fontSizeSmall,
-        height: 24,
-        lineHeight: variables.lineHeightXLarge,
+        paddingTop: 2,
     },
 
     chatItemMessage: {
@@ -1337,8 +1335,6 @@ const styles = {
         fontSize: variables.fontSizeNormal,
         fontFamily: fontFamily.EXP_NEUE,
         lineHeight: variables.lineHeightXLarge,
-        marginTop: -2,
-        marginBottom: -2,
         maxWidth: '100%',
         cursor: 'auto',
         ...whiteSpace.preWrap,