diff --git a/src/components/views/messages/MFileBody.js b/src/components/views/messages/MFileBody.js
index 9dc1de7683..53d37d73da 100644
--- a/src/components/views/messages/MFileBody.js
+++ b/src/components/views/messages/MFileBody.js
@@ -102,6 +102,8 @@ export default class MFileBody extends React.Component {
         tileShape: PropTypes.string,
         /* whether or not to show the default placeholder for the file. Defaults to true. */
         showGenericPlaceholder: PropTypes.bool,
+        /* to set source to local file path during export */
+        mediaSrc: PropTypes.string,
     };
 
     static defaultProps = {
@@ -178,7 +180,13 @@ export default class MFileBody extends React.Component {
             );
         }
 
-        if (isEncrypted) {
+        if (this.props.mediaSrc) {
+            return <span className="mx_MFileBody">
+                <a href={this.props.mediaSrc}>
+                    { placeholder }
+                </a>
+            </span>;
+        } else if (isEncrypted) {
             if (this.state.decryptedBlob === null) {
                 // Need to decrypt the attachment
                 // Wait for the user to click on the link before downloading
diff --git a/src/components/views/rooms/EventTile.tsx b/src/components/views/rooms/EventTile.tsx
index be748d6b71..a7bfb40ad0 100644
--- a/src/components/views/rooms/EventTile.tsx
+++ b/src/components/views/rooms/EventTile.tsx
@@ -936,7 +936,7 @@ export default class EventTile extends React.Component<IProps, IState> {
             avatar = (
                 <div className="mx_EventTile_avatar">
                     <MemberAvatar
-                        avatarSrc = {this.props.avatarSrc}
+                        avatarSrc={this.props.avatarSrc}
                         member={member}
                         width={avatarSize}
                         height={avatarSize}
diff --git a/src/utils/exportUtils/HtmlExport.tsx b/src/utils/exportUtils/HtmlExport.tsx
index a69fab9f06..80ba643f81 100644
--- a/src/utils/exportUtils/HtmlExport.tsx
+++ b/src/utils/exportUtils/HtmlExport.tsx
@@ -236,6 +236,14 @@ export default class HTMLExporter extends Exporter {
                 this.zip.file(filePath, blob);
                 break;
             }
+            case "m.file": {
+                const blob = await this.getMediaBlob(mxEv);
+                const fileName = mxEv.getContent().body;
+                const filePath = `files/${fileName}`;
+                eventTile = this.getEventTile(mxEv, joined, filePath);
+                this.zip.file(filePath, blob);
+                break;
+            }
             default:
                 eventTile = this.getEventTile(mxEv, joined);
                 break;