Cherrypick of 3466 for release 1.25 (#3504)

app/components/message_attachments/attachment_image/__snapshots__/index.test.js.snap

@@ -23,7 +23,6 @@ exports[`AttachmentImage it matches snapshot 1`] = `
           "borderRadius": 2,
           "borderWidth": 1,
           "flex": 1,
-          "padding": 5,
         },
         Object {
           "height": 28,

app/components/message_attachments/attachment_image/index.js

@@ -169,7 +169,6 @@ const getStyleSheet = makeStyleSheetFromTheme((theme) => {
             borderWidth: 1,
             borderRadius: 2,
             flex: 1,
-            padding: 5,
         },
     };
 });

app/components/progressive_image/progressive_image.js

@@ -171,7 +171,7 @@ export default class ProgressiveImage extends PureComponent {
                     resizeMethod={resizeMethod}
                     onError={onError}
                     source={{uri}}
-                    style={this.computedStyle}
+                    style={[this.computedStyle, styles.attachmentMargin]}
                 >
                     {this.props.children}
                 </ImageComponent>
@@ -193,4 +193,10 @@ const styles = StyleSheet.create({
         alignItems: 'center',
         justifyContent: 'center',
     },
+    attachmentMargin: {
+        marginTop: 2.5,
+        marginLeft: 2.5,
+        marginBottom: 5,
+        marginRight: 5,
+    },
 });