diff --git a/src/components/views/elements/ReplyThread.js b/src/components/views/elements/ReplyThread.js
index a9bea25851..1ca68f18a8 100644
--- a/src/components/views/elements/ReplyThread.js
+++ b/src/components/views/elements/ReplyThread.js
@@ -73,7 +73,7 @@ export default class ReplyThread extends React.Component {
 
         this.unmounted = false;
 
-        if (this.props.forExport) {
+        if (!this.props.forExport) {
             this.context.on("Event.replaced", this.onEventReplaced);
             this.room = this.context.getRoom(this.props.parentEv.getRoomId());
             this.room.on("Room.redaction", this.onRoomRedaction);
diff --git a/src/utils/exportUtils/Exporter.ts b/src/utils/exportUtils/Exporter.ts
index 3f2e8e3caa..1a0b9fe187 100644
--- a/src/utils/exportUtils/Exporter.ts
+++ b/src/utils/exportUtils/Exporter.ts
@@ -7,7 +7,7 @@ import { decryptFile } from "../DecryptFile";
 import { mediaFromContent } from "../../customisations/Media";
 import { formatFullDateNoDay } from "../../DateUtils";
 import { MatrixClient } from "matrix-js-sdk";
-import streamToZIP from "./StreamToZip";
+import streamToZIP from "./ZipStream";
 import * as ponyfill from "web-streams-polyfill/ponyfill"
 import "web-streams-polyfill/ponyfill"; // to support streams API for older browsers
 
diff --git a/src/utils/exportUtils/StreamToZip.ts b/src/utils/exportUtils/ZipStream.ts
similarity index 98%
rename from src/utils/exportUtils/StreamToZip.ts
rename to src/utils/exportUtils/ZipStream.ts
index 5e5b692793..4cb9060915 100644
--- a/src/utils/exportUtils/StreamToZip.ts
+++ b/src/utils/exportUtils/ZipStream.ts
@@ -1,3 +1,5 @@
+// Based on https://github.com/jimmywarting/StreamSaver.js/blob/master/examples/zip-stream.js
+
 /* global ReadableStream */
 
 type TypedArray =