diff --git a/src/components/AttachmentModal.js b/src/components/AttachmentModal.js
index 86eb8c56345e..2dfdb991f9f2 100755
--- a/src/components/AttachmentModal.js
+++ b/src/components/AttachmentModal.js
@@ -86,6 +86,9 @@ class AttachmentModal extends PureComponent {
             modalType: CONST.MODAL.MODAL_TYPE.CENTERED_UNSWIPEABLE,
             isConfirmButtonDisabled: false,
             confirmButtonFadeAnimation: new Animated.Value(1),
+            file: props.originalFileName ? {
+                name: props.originalFileName,
+            } : undefined,
         };
 
         this.submitAndClose = this.submitAndClose.bind(this);
diff --git a/src/components/AttachmentView.js b/src/components/AttachmentView.js
index d749cf4a867b..23e385cb0c23 100755
--- a/src/components/AttachmentView.js
+++ b/src/components/AttachmentView.js
@@ -97,8 +97,9 @@ const AttachmentView = (props) => {
 
     // For this check we use both source and file.name since temporary file source is a blob
     // both PDFs and images will appear as images when pasted into the the text field
-    if (Str.isImage(props.source) || (props.file && Str.isImage(props.file.name))) {
-        const children = <ImageView url={props.source} isAuthTokenRequired={props.isAuthTokenRequired} />;
+    const isImage = Str.isImage(props.source);
+    if (isImage || (props.file && Str.isImage(props.file.name))) {
+        const children = <ImageView url={props.source} isAuthTokenRequired={isImage && props.isAuthTokenRequired} />;
         return (
             props.onPress ? (
                 <Pressable onPress={props.onPress} disabled={loadComplete} style={containerStyles}>
diff --git a/src/components/ImageView/index.js b/src/components/ImageView/index.js
index 8c48da7833cd..b05be361c9e1 100644
--- a/src/components/ImageView/index.js
+++ b/src/components/ImageView/index.js
@@ -35,7 +35,7 @@ class ImageView extends PureComponent {
         this.trackPointerPosition = this.trackPointerPosition.bind(this);
 
         this.state = {
-            isLoading: false,
+            isLoading: true,
             containerHeight: 0,
             containerWidth: 0,
             isZoomed: false,
@@ -275,7 +275,7 @@ class ImageView extends PureComponent {
                 <Pressable
                     style={{
                         ...StyleUtils.getZoomSizingStyle(this.state.isZoomed, this.state.imgWidth, this.state.imgHeight, this.state.zoomScale,
-                            this.state.containerHeight, this.state.containerWidth),
+                            this.state.containerHeight, this.state.containerWidth, this.state.isLoading),
                         ...StyleUtils.getZoomCursorStyle(this.state.isZoomed, this.state.isDragging),
                         ...this.state.isZoomed && this.state.zoomScale >= 1 ? styles.pRelative : styles.pAbsolute,
                         ...styles.flex1,
@@ -285,10 +285,10 @@ class ImageView extends PureComponent {
                 >
                     <Image
                         source={{uri: this.props.url}}
-                        style={this.state.isLoading ? undefined : [
+                        style={[
                             styles.h100,
                             styles.w100,
-                        ]} // Hide image until finished loading to prevent showing preview with wrong dimensions.
+                        ]}
                         resizeMode={Image.resizeMode.contain}
                         onLoadStart={this.imageLoadingStart}
                         onLoad={this.imageLoad}
diff --git a/src/libs/actions/PersonalDetails.js b/src/libs/actions/PersonalDetails.js
index f8ed8a839929..8e4b9e1bc564 100644
--- a/src/libs/actions/PersonalDetails.js
+++ b/src/libs/actions/PersonalDetails.js
@@ -290,11 +290,13 @@ function updateAvatar(file) {
             [currentUserEmail]: {
                 avatar: file.uri,
                 avatarThumbnail: file.uri,
+                originalFileName: file.name,
                 errorFields: {
                     avatar: null,
                 },
                 pendingFields: {
                     avatar: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                    originalFileName: null,
                 },
             },
         },
diff --git a/src/pages/DetailsPage.js b/src/pages/DetailsPage.js
index df926a1ae8e1..84c36ea945d0 100755
--- a/src/pages/DetailsPage.js
+++ b/src/pages/DetailsPage.js
@@ -134,6 +134,7 @@ class DetailsPage extends React.PureComponent {
                                         headerTitle={displayName}
                                         source={ReportUtils.getFullSizeAvatar(details.avatar, details.login)}
                                         isAuthTokenRequired
+                                        originalFileName={details.originalFileName}
                                     >
                                         {({show}) => (
                                             <PressableWithoutFocus
diff --git a/src/styles/StyleUtils.js b/src/styles/StyleUtils.js
index 46d1c19c3e04..e149bcc707a9 100644
--- a/src/styles/StyleUtils.js
+++ b/src/styles/StyleUtils.js
@@ -196,14 +196,13 @@ function getZoomCursorStyle(isZoomed, isDragging) {
  * @param {Number} zoomScale
  * @param {Number} containerHeight
  * @param {Number} containerWidth
- * @return {Object}
+ * @param {Boolean} isLoading
+ * @returns {Object | undefined}
  */
-function getZoomSizingStyle(isZoomed, imgWidth, imgHeight, zoomScale, containerHeight, containerWidth) {
-    if (imgWidth === 0 || imgHeight === 0) {
-        return {
-            height: isZoomed ? '250%' : '100%',
-            width: isZoomed ? '250%' : '100%',
-        };
+function getZoomSizingStyle(isZoomed, imgWidth, imgHeight, zoomScale, containerHeight, containerWidth, isLoading) {
+    // Hide image until finished loading to prevent showing preview with wrong dimensions
+    if (isLoading || imgWidth === 0 || imgHeight === 0) {
+        return undefined;
     }
     const top = `${Math.max((containerHeight - imgHeight) / 2, 0)}px`;
     const left = `${Math.max((containerWidth - imgWidth) / 2, 0)}px`;