diff --git a/src/components/Chat.vue b/src/components/Chat.vue
index b160d22..9e9c68d 100644
--- a/src/components/Chat.vue
+++ b/src/components/Chat.vue
@@ -82,8 +82,10 @@
               v-on:send-quick-reaction="sendQuickReaction"
               v-on:context-menu="showContextMenuForEvent($event)"
               v-on:own-avatar-clicked="viewProfile"
+              v-on:download="download(event)"
             />
             <!-- <div v-if="debugging" style="user-select:text">EventID: {{ event.getId() }}</div> -->
+            <!-- <div v-if="debugging" style="user-select:text">Event: {{ JSON.stringify(event) }}</div> -->
             <div
               v-if="event.getId() == readMarker && index < events.length - 1"
               class="read-marker"
@@ -314,10 +316,12 @@
 <script>
 import { TimelineWindow, EventTimeline } from "matrix-js-sdk";
 import MessageIncomingText from "./messages/MessageIncomingText";
+import MessageIncomingFile from "./messages/MessageIncomingFile";
 import MessageIncomingImage from "./messages/MessageIncomingImage.vue";
 import MessageIncomingAudio from "./messages/MessageIncomingAudio.vue";
 import MessageIncomingVideo from "./messages/MessageIncomingVideo.vue";
 import MessageOutgoingText from "./messages/MessageOutgoingText";
+import MessageOutgoingFile from "./messages/MessageOutgoingFile";
 import MessageOutgoingImage from "./messages/MessageOutgoingImage.vue";
 import MessageOutgoingAudio from "./messages/MessageOutgoingAudio.vue";
 import MessageOutgoingVideo from "./messages/MessageOutgoingVideo.vue";
@@ -376,10 +380,12 @@ export default {
   components: {
     ChatHeader,
     MessageIncomingText,
+    MessageIncomingFile,
     MessageIncomingImage,
     MessageIncomingAudio,
     MessageIncomingVideo,
     MessageOutgoingText,
+    MessageOutgoingFile,
     MessageOutgoingImage,
     MessageOutgoingAudio,
     MessageOutgoingVideo,
@@ -812,6 +818,8 @@ export default {
               return MessageIncomingAudio;
             } else if (event.getContent().msgtype == "m.video") {
               return MessageIncomingVideo;
+            } else if (event.getContent().msgtype == "m.file") {
+              return MessageIncomingFile;
             }
             return MessageIncomingText;
           } else {
@@ -821,6 +829,8 @@ export default {
               return MessageOutgoingAudio;
             } else if (event.getContent().msgtype == "m.video") {
               return MessageOutgoingVideo;
+            } else if (event.getContent().msgtype == "m.file") {
+              return MessageOutgoingFile;
             }
             return MessageOutgoingText;
           }
diff --git a/src/components/messages/MessageIncomingFile.vue b/src/components/messages/MessageIncomingFile.vue
new file mode 100644
index 0000000..63dc075
--- /dev/null
+++ b/src/components/messages/MessageIncomingFile.vue
@@ -0,0 +1,51 @@
+<template>
+  <div :class="messageClasses">
+    <v-avatar class="avatar" size="32" color="#ededed">
+      <img v-if="messageEventAvatar(event)" :src="messageEventAvatar(event)" />
+      <span v-else class="white--text headline">{{
+        messageEventDisplayName(event).substring(0, 1).toUpperCase()
+      }}</span>
+    </v-avatar>
+
+    <div class="bubble">
+      <QuickReactions :event="event" :reactions="reactions" />
+      <div class="original-message" v-if="inReplyToText">
+        <div class="original-message-sender">
+          {{ inReplyToSender || "Someone" }} said:
+        </div>
+        <div class="original-message-text" v-html="linkify($sanitize(inReplyToText))" />
+      </div>
+      <div class="message">
+        <span>File: </span>
+        <span style="cursor:pointer" @click.stop="$emit('download')" v-html="linkify($sanitize(messageText))" />
+        <span class="edit-marker" v-if="event.replacingEventId()"
+          >(edited)</span
+        >
+      </div>
+      <!-- <div>{{ JSON.stringify(event) }}</div> -->
+    </div>
+    <div class="op-button" ref="opbutton">
+      <v-btn icon @click.stop="showContextMenu($refs.opbutton)"
+        ><v-icon>more_vert</v-icon></v-btn
+      >
+    </div>
+    <div v-if="showSenderAndTime" class="senderAndTime">
+      <div class="sender">{{ messageEventDisplayName(event) }}</div>
+      <div class="time">
+        {{ formatTime(event.event.origin_server_ts) }}
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import messageMixin from "./messageMixin";
+
+export default {
+  mixins: [messageMixin],
+};
+</script>
+
+<style lang="scss">
+@import "@/assets/css/chat.scss";
+</style>
\ No newline at end of file
diff --git a/src/components/messages/MessageOutgoingFile.vue b/src/components/messages/MessageOutgoingFile.vue
new file mode 100644
index 0000000..6bdacdb
--- /dev/null
+++ b/src/components/messages/MessageOutgoingFile.vue
@@ -0,0 +1,48 @@
+<template>
+  <div class="messageOut">
+    <div class="op-button" ref="opbutton">
+      <v-btn icon @click.stop="showContextMenu($refs.opbutton)"
+        ><v-icon>more_vert</v-icon></v-btn
+      >
+    </div>
+    <div class="bubble">
+      <QuickReactions :event="event" :reactions="reactions" />
+      <div class="original-message" v-if="inReplyToText">
+        <div class="original-message-sender">
+          {{ inReplyToSender || "Someone" }} said:
+        </div>
+        <div class="original-message-text" v-html="linkify($sanitize(inReplyToText))" />
+      </div>
+
+      <div class="message">
+        <span>File: </span>
+        <span style="cursor:pointer" @click.stop="$emit('download')" v-html="linkify($sanitize(messageText))" />
+        <span class="edit-marker" v-if="event.replacingEventId()"
+          >(edited)</span
+        >
+      </div>
+    </div>
+    <v-avatar class="avatar" size="32" color="#ededed" @click.stop="ownAvatarClicked">
+      <img v-if="userAvatar" :src="userAvatar" />
+      <span v-else class="white--text headline">{{ userAvatarLetter }}</span>
+    </v-avatar>
+    <!-- <div class="sender">{{ "You" }}</div> -->
+    <div class="senderAndTime">
+      <div class="time">
+        {{ formatTime(event.event.origin_server_ts) }}
+      </div>
+      <div class="status">{{ event.status }}</div>
+    </div>
+  </div>
+</template>
+
+<script>
+import messageMixin from "./messageMixin";
+
+export default {
+  mixins: [messageMixin],
+};
+</script>
+<style lang="scss">
+@import "@/assets/css/chat.scss";
+</style>
\ No newline at end of file