diff --git a/src/components/AttachmentCarousel.js b/src/components/AttachmentCarousel.js
index e240323ec854..48e4624967bb 100644
--- a/src/components/AttachmentCarousel.js
+++ b/src/components/AttachmentCarousel.js
@@ -176,7 +176,7 @@ class AttachmentCarousel extends React.Component {
                 )}
                 <SwipeableView
                     isAnimated
-                    onPress={() => canUseTouchScreen() && this.onShowArrow(!this.state.showArrows)}                    
+                    onPress={() => canUseTouchScreen() && this.onShowArrow(!this.state.showArrows)}
                     onSwipeHorizontal={this.cycleThroughAttachments}
                 >
                     <AttachmentView sourceURL={this.state.sourceURL} file={this.state.file} />
diff --git a/src/components/ImageView/index.native.js b/src/components/ImageView/index.native.js
index cf763b7a00fc..543353990682 100644
--- a/src/components/ImageView/index.native.js
+++ b/src/components/ImageView/index.native.js
@@ -55,6 +55,14 @@ class ImageView extends PureComponent {
         this.state.interactionPromise = InteractionManager.runAfterInteractions(() => this.calculateImageSize());
     }
 
+    componentDidUpdate() {
+        // This resizes the images on cycling
+        if (!this.state.containerHeight || this.state.isLoading) {
+            return;
+        }
+        this.calculateImageSize();
+    }
+
     componentWillUnmount() {
         if (!this.state.interactionPromise) {
             return;