diff --git a/src/components/SvgIcon/SvgIcon.scss b/src/components/SvgIcon/SvgIcon.scss
index f69cf747..e31b7cdb 100644
--- a/src/components/SvgIcon/SvgIcon.scss
+++ b/src/components/SvgIcon/SvgIcon.scss
@@ -34,6 +34,10 @@
 	fill: var(--chat-icon-color-close-outline);
 }
 
+#vac-icon-close-outline-preview {
+	fill: var(--chat-icon-color-close-preview);
+}
+
 #vac-icon-send {
 	fill: var(--chat-icon-color-send);
 }
diff --git a/src/lib/ChatWindow.scss b/src/lib/ChatWindow.scss
index 904fd03f..2a190668 100644
--- a/src/lib/ChatWindow.scss
+++ b/src/lib/ChatWindow.scss
@@ -5,7 +5,6 @@
 	background: var(--chat-content-bg-color);
 	color: var(--chat-color);
 	overflow-wrap: break-word;
-	position: relative;
 	white-space: normal;
 	border: var(--chat-container-border);
 	border-radius: var(--chat-container-border-radius);
diff --git a/src/lib/ChatWindow.vue b/src/lib/ChatWindow.vue
index d7170e3f..cc15f9ba 100644
--- a/src/lib/ChatWindow.vue
+++ b/src/lib/ChatWindow.vue
@@ -78,12 +78,20 @@
 				</template>
 			</room>
 		</div>
+		<transition name="vac-fade-preview" appear>
+			<media-preview
+				v-if="showMediaPreview"
+				:file="previewFile"
+				@close-media-preview="showMediaPreview = false"
+			/>
+		</transition>
 	</div>
 </template>
 
 <script>
 import RoomsList from './RoomsList/RoomsList'
 import Room from './Room/Room'
+import MediaPreview from './MediaPreview/MediaPreview'
 
 import locales from '../locales'
 import { defaultThemeStyles, cssThemeVars } from '../themes'
@@ -96,7 +104,8 @@ export default {
 	name: 'ChatContainer',
 	components: {
 		RoomsList,
-		Room
+		Room,
+		MediaPreview
 	},
 
 	props: {
@@ -158,7 +167,8 @@ export default {
 		roomMessage: { type: String, default: '' },
 		scrollDistance: { type: Number, default: 60 },
 		acceptedFiles: { type: String, default: '*' },
-		templatesText: { type: Array, default: null }
+		templatesText: { type: Array, default: null },
+		mediaPreviewEnabled: { type: Boolean, default: true }
 	},
 
 	emits: [
@@ -185,7 +195,9 @@ export default {
 			room: {},
 			loadingMoreRooms: false,
 			showRoomsList: true,
-			isMobile: false
+			isMobile: false,
+			showMediaPreview: false,
+			previewFile: {}
 		}
 	},
 
@@ -327,7 +339,12 @@ export default {
 			this.$emit('delete-message', { message, roomId: this.room.roomId })
 		},
 		openFile({ message, file }) {
-			this.$emit('open-file', { message, file })
+			if (this.mediaPreviewEnabled && file.action === 'preview') {
+				this.previewFile = file.file
+				this.showMediaPreview = true
+			} else {
+				this.$emit('open-file', { message, file })
+			}
 		},
 		openUserTag({ user }) {
 			this.$emit('open-user-tag', { user })
diff --git a/src/lib/MediaPreview/MediaPreview.scss b/src/lib/MediaPreview/MediaPreview.scss
new file mode 100644
index 00000000..cf18eb54
--- /dev/null
+++ b/src/lib/MediaPreview/MediaPreview.scss
@@ -0,0 +1,38 @@
+.vac-media-preview {
+	position: absolute;
+	top: 0;
+	left: 0;
+	z-index: 99;
+	width: 100vw;
+	height: 100vh;
+	background-color: rgba(0, 0, 0, 0.8);
+	outline: none;
+
+	.vac-media-preview-container {
+		width: 100%;
+		height: 100%;
+	}
+
+	.vac-image-preview {
+		width: 100%;
+		height: 100%;
+		background-size: contain;
+		background-repeat: no-repeat;
+		background-position: center;
+	}
+
+	.vac-svg-button {
+		position: absolute;
+		top: 30px;
+		right: 30px;
+		transform: scale(1.4);
+	}
+
+	@media only screen and (max-width: 768px) {
+		.vac-svg-button {
+			top: 20px;
+			right: 20px;
+			transform: scale(1.2);
+		}
+	}
+}
diff --git a/src/lib/MediaPreview/MediaPreview.vue b/src/lib/MediaPreview/MediaPreview.vue
new file mode 100644
index 00000000..f62a8d2f
--- /dev/null
+++ b/src/lib/MediaPreview/MediaPreview.vue
@@ -0,0 +1,69 @@
+<template>
+	<div
+		ref="modal"
+		tabindex="0"
+		class="vac-media-preview"
+		@click.stop="closeModal"
+		@keydown.esc="closeModal"
+	>
+		<transition name="vac-bounce-preview" appear>
+			<div v-if="isImage" class="vac-media-preview-container">
+				<div
+					class="vac-image-preview"
+					:style="{
+						'background-image': `url('${file.url}')`
+					}"
+				/>
+			</div>
+
+			<div v-else-if="isVideo" class="vac-media-preview-container">
+				<video width="100%" height="100%" controls autoplay>
+					<source :src="file.url" />
+				</video>
+			</div>
+		</transition>
+
+		<div class="vac-svg-button">
+			<slot name="preview-close-icon">
+				<svg-icon name="close-outline" param="preview" />
+			</slot>
+		</div>
+	</div>
+</template>
+<script>
+import SvgIcon from '../../components/SvgIcon/SvgIcon'
+
+const { isImageFile, isVideoFile } = require('../../utils/media-file')
+
+export default {
+	name: 'MediaPreview',
+	components: {
+		SvgIcon
+	},
+
+	props: {
+		file: { type: Object, required: true }
+	},
+
+	emits: ['close-media-preview'],
+
+	computed: {
+		isImage() {
+			return isImageFile(this.file)
+		},
+		isVideo() {
+			return isVideoFile(this.file)
+		}
+	},
+
+	mounted() {
+		this.$refs.modal.focus()
+	},
+
+	methods: {
+		closeModal() {
+			this.$emit('close-media-preview')
+		}
+	}
+}
+</script>
diff --git a/src/lib/Message/MessageFiles/MessageFile/MessageFile.scss b/src/lib/Message/MessageFiles/MessageFile/MessageFile.scss
index d3fe20e2..f31fe392 100644
--- a/src/lib/Message/MessageFiles/MessageFile/MessageFile.scss
+++ b/src/lib/Message/MessageFiles/MessageFile/MessageFile.scss
@@ -55,6 +55,7 @@
 		width: 350px;
 		max-width: 100%;
 		margin: 4px auto 5px;
+		cursor: pointer;
 
 		video {
 			border-radius: 4px;
diff --git a/src/lib/Message/MessageFiles/MessageFile/MessageFile.vue b/src/lib/Message/MessageFiles/MessageFile/MessageFile.vue
index 5e393d4c..ba96ae58 100644
--- a/src/lib/Message/MessageFiles/MessageFile/MessageFile.vue
+++ b/src/lib/Message/MessageFiles/MessageFile/MessageFile.vue
@@ -58,7 +58,11 @@
 			</div>
 		</div>
 
-		<div v-else-if="isVideo" class="vac-video-container">
+		<div
+			v-else-if="isVideo"
+			class="vac-video-container"
+			@click.stop.prevent="openFile('preview')"
+		>
 			<video width="100%" height="100%" controls>
 				<source :src="file.url" />
 			</video>
diff --git a/src/styles/animation.scss b/src/styles/animation.scss
index b2f1a7f3..44222dd1 100644
--- a/src/styles/animation.scss
+++ b/src/styles/animation.scss
@@ -98,3 +98,34 @@
 		transform: scale(1);
 	}
 }
+
+// Open media preview animation
+.vac-fade-preview-enter {
+	opacity: 0;
+}
+
+.vac-fade-preview-enter-active {
+	transition: opacity 0.1s;
+}
+
+.vac-fade-preview-leave-active {
+	transition: opacity 0.2s;
+	opacity: 0;
+}
+
+.vac-bounce-preview-enter-active {
+	animation: vac-bounce-image-in 0.4s;
+}
+
+.vac-bounce-preview-leave-active {
+	animation: vac-bounce-image-in 0.3s reverse;
+}
+
+@keyframes vac-bounce-image-in {
+	0% {
+		transform: scale(0.6);
+	}
+	100% {
+		transform: scale(1);
+	}
+}
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 3ae26536..8637eaf3 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -4,6 +4,8 @@
 
 @import '../lib/ChatWindow';
 
+@import '../lib/MediaPreview/MediaPreview';
+
 @import '../lib/Room/Room';
 @import '../lib/Room/RoomEmojis/RoomEmojis';
 @import '../lib/Room/RoomHeader/RoomHeader';
diff --git a/src/themes/index.js b/src/themes/index.js
index d45fc123..4b376a30 100644
--- a/src/themes/index.js
+++ b/src/themes/index.js
@@ -119,6 +119,7 @@ export const defaultThemeStyles = {
 			file: '#1976d2',
 			paperclip: '#1976d2',
 			closeOutline: '#000',
+			closePreview: '#fff',
 			send: '#1976d2',
 			sendDisabled: '#9ca6af',
 			emoji: '#1976d2',
@@ -259,6 +260,7 @@ export const defaultThemeStyles = {
 			file: '#1976d2',
 			paperclip: '#fff',
 			closeOutline: '#fff',
+			closePreview: '#fff',
 			send: '#fff',
 			sendDisabled: '#646a70',
 			emoji: '#fff',
@@ -407,6 +409,7 @@ export const cssThemeVars = ({
 		'--chat-icon-color-file': icons.file,
 		'--chat-icon-color-paperclip': icons.paperclip,
 		'--chat-icon-color-close-outline': icons.closeOutline,
+		'--chat-icon-color-close-preview': icons.closePreview,
 		'--chat-icon-color-send': icons.send,
 		'--chat-icon-color-send-disabled': icons.sendDisabled,
 		'--chat-icon-color-emoji': icons.emoji,