diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 79cd5654..7145d3e6 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -8,7 +8,7 @@
     "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/~3e4fdd8b.js": "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/~3e4fdd8b.js?id=df6ace416e23038cf96c",
     "/chunks/admin~chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-item~9b68162c.js": "/chunks/admin~chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-item~9b68162c.js?id=556460202edd9a6086fe",
     "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~673d1ac3.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~673d1ac3.js?id=c01cde1da36dcd859bed",
-    "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.js?id=63c58f5170d48242a3e7",
+    "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.js?id=7c3958b2889be85249bb",
     "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~1bec6fe4.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~1bec6fe4.js?id=2483e956635c6b940795",
     "/chunks/admin~chunks/platform.js": "/chunks/admin~chunks/platform.js?id=7dff2be7cf41d68d61a7",
     "/chunks/admin~chunks/platform~chunks/settings.js": "/chunks/admin~chunks/platform~chunks/settings.js?id=4ce25ba9fc9ba54b7f6d",
@@ -41,7 +41,7 @@
     "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared-with-me~chun~fd99312c.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared-with-me~chun~fd99312c.js?id=42944aee3313456a7e1c",
     "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~c7960950.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~c7960950.js?id=0d0aceb50608f8d43548",
     "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/settings-subscription~chunks/shared~f3cd1a63.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/settings-subscription~chunks/shared~f3cd1a63.js?id=93200e8f38e44f4b59f0",
-    "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.js?id=eb119943f935f9ec4c66",
+    "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.js?id=8d58adc07469b13998e9",
     "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~bf3ddedc.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~bf3ddedc.js?id=d764385b104ca8009e36",
     "/chunks/files~chunks/shared-with-me~chunks/shared/files~chunks/team-folders.js": "/chunks/files~chunks/shared-with-me~chunks/shared/files~chunks/team-folders.js?id=fbf0381594bdcd60f933",
     "/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=a0e9489eeb40a00f1637",
@@ -307,5 +307,29 @@
     "/chunks/platform.4ae986b0ccfb06bc688e.hot-update.js": "/chunks/platform.4ae986b0ccfb06bc688e.hot-update.js",
     "/chunks/platform.4e8b6c17baa0f800b27c.hot-update.js": "/chunks/platform.4e8b6c17baa0f800b27c.hot-update.js",
     "/chunks/platform.ce7db58217428f876be9.hot-update.js": "/chunks/platform.ce7db58217428f876be9.hot-update.js",
-    "/chunks/platform.cc92f5cec585527266c4.hot-update.js": "/chunks/platform.cc92f5cec585527266c4.hot-update.js"
+    "/chunks/platform.cc92f5cec585527266c4.hot-update.js": "/chunks/platform.cc92f5cec585527266c4.hot-update.js",
+    "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.23ccfd82bd9a98cdc42f.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.23ccfd82bd9a98cdc42f.hot-update.js",
+    "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.ac2a8f1eafae229b951d.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.ac2a8f1eafae229b951d.hot-update.js",
+    "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.afe6ebb6e2fbe5cd1830.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.afe6ebb6e2fbe5cd1830.hot-update.js",
+    "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.a8b2c2906959d5d1910a.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.a8b2c2906959d5d1910a.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.322fd6aeadccf19f85e3.hot-update.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.322fd6aeadccf19f85e3.hot-update.js",
+    "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.9917f9faf846999b9e62.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.9917f9faf846999b9e62.hot-update.js",
+    "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.fddf652789c758577086.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.fddf652789c758577086.hot-update.js",
+    "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.fb0ea700cc29f147c6f8.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.fb0ea700cc29f147c6f8.hot-update.js",
+    "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.370aaf7c1de164eb97ee.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.370aaf7c1de164eb97ee.hot-update.js",
+    "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.021a77432808b7c60a95.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.021a77432808b7c60a95.hot-update.js",
+    "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.1033ca344f5328069213.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.1033ca344f5328069213.hot-update.js",
+    "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.0b996895fef59d4dcf92.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.0b996895fef59d4dcf92.hot-update.js",
+    "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.6379da6a3c16c6686fdf.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.6379da6a3c16c6686fdf.hot-update.js",
+    "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.d3c716a9c5d881d0eb4e.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.d3c716a9c5d881d0eb4e.hot-update.js",
+    "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.cced94df3cb8b855aaa1.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.cced94df3cb8b855aaa1.hot-update.js",
+    "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.09d2c337c23e40e08e93.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.09d2c337c23e40e08e93.hot-update.js",
+    "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.f95e8d8b41c7ed936394.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.f95e8d8b41c7ed936394.hot-update.js",
+    "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.b75b14b30079b11444a8.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.b75b14b30079b11444a8.hot-update.js",
+    "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.337ea39fcfb5063a158e.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.337ea39fcfb5063a158e.hot-update.js",
+    "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.b106c813726daf7134e6.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.b106c813726daf7134e6.hot-update.js",
+    "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.8de8c7d8ed9bf91a918d.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.8de8c7d8ed9bf91a918d.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.b2c3e6811a2f5819dfa4.hot-update.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.b2c3e6811a2f5819dfa4.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.f6f728e6d731adadf7f2.hot-update.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.f6f728e6d731adadf7f2.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.e809dd57c5e48dd04001.hot-update.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.e809dd57c5e48dd04001.hot-update.js"
 }
diff --git a/resources/js/components/FilesView/AuthorThumbnail.vue b/resources/js/components/FilesView/AuthorThumbnail.vue
index b7127a9d..cadccbfa 100644
--- a/resources/js/components/FilesView/AuthorThumbnail.vue
+++ b/resources/js/components/FilesView/AuthorThumbnail.vue
@@ -4,7 +4,7 @@
 			v-if="item.data.relationships.user.data.attributes.avatar"
 			class="user-image"
 			:src="item.data.relationships.user.data.attributes.avatar"
-			alt="item.data.relationships.user.data.attributes.name"
+			:alt="item.data.relationships.user.data.attributes.name"
 		>
 		<TypedAvatar
 			v-else
@@ -22,9 +22,9 @@
 		components: {
 			TypedAvatar
 		},
-		props: {
-			item: {type: Function}
-		}
+		props: [
+			'item',
+		]
 	}
 </script>
 <style scoped lang="scss">
diff --git a/resources/js/components/FilesView/InfoSidebar.vue b/resources/js/components/FilesView/InfoSidebar.vue
index 5851064e..89e59fca 100644
--- a/resources/js/components/FilesView/InfoSidebar.vue
+++ b/resources/js/components/FilesView/InfoSidebar.vue
@@ -31,6 +31,17 @@
 		<!--File info-->
         <ListInfo v-if="isSingleFile && !isEmpty">
 
+			<!--Author-->
+            <ListInfoItem
+				v-if="canShowAuthor"
+				:title="$t('Author')"
+			>
+                <div class="author-preview">
+					<MemberAvatar :size="32" :member="singleFile.data.relationships.user" />
+                    <span class="name">{{ singleFile.data.relationships.user.data.attributes.name }}</span>
+                </div>
+            </ListInfoItem>
+
 			<!--Filesize-->
             <ListInfoItem
 				v-if="singleFile.data.attributes.filesize"
@@ -94,21 +105,23 @@
 </template>
 
 <script>
-	import TeamMembersPreview from "../Teams/Components/TeamMembersPreview"
 	import FilePreviewDetail from '/resources/js/components/Others/FilePreviewDetail'
-    import {Edit2Icon, LockIcon, UnlockIcon} from 'vue-feather-icons'
-	import ImageMetaData from '/resources/js/components/FilesView/ImageMetaData'
-    import EmptyMessage from '/resources/js/components/FilesView/EmptyMessage'
-	import TitlePreview from '/resources/js/components/FilesView/TitlePreview'
 	import CopyShareLink from '/resources/js/components/Others/Forms/CopyShareLink'
+	import ImageMetaData from '/resources/js/components/FilesView/ImageMetaData'
+	import EmptyMessage from '/resources/js/components/FilesView/EmptyMessage'
+	import TitlePreview from '/resources/js/components/FilesView/TitlePreview'
+	import TeamMembersPreview from "../Teams/Components/TeamMembersPreview"
 	import ListInfoItem from '/resources/js/components/Others/ListInfoItem'
+	import {Edit2Icon, LockIcon, UnlockIcon} from 'vue-feather-icons'
 	import ListInfo from '/resources/js/components/Others/ListInfo'
-	import {mapGetters} from 'vuex'
 	import {events} from '/resources/js/bus'
+	import {mapGetters} from 'vuex'
+	import MemberAvatar from "./MemberAvatar";
 
 	export default {
 		name: 'InfoSidebar',
 		components: {
+			MemberAvatar,
 			TeamMembersPreview,
 			FilePreviewDetail,
 			ImageMetaData,
@@ -125,6 +138,7 @@
 			...mapGetters([
 				'permissionOptions',
 				'clipboard',
+				'user',
 			]),
 			isEmpty() {
 				return this.clipboard.length === 0
@@ -148,6 +162,10 @@
 
 				return title ? this.$t(title.label) : this.$t('shared.can_download')
 			},
+			canShowAuthor() {
+				return this.$isThisRoute(this.$route, ['SharedWithMe', 'TeamFolders'])
+					&& this.user.data.id !== this.clipboard[0].data.relationships.user.data.id
+			},
 		},
 		methods: {
 			openShareOptions() {
@@ -162,6 +180,16 @@
 
 <style scoped lang="scss">
 
+	.author-preview	{
+		display: flex;
+		align-items: center;
+
+		.name {
+			margin-left: 10px;
+			display: block;
+		}
+	}
+
 	.info-wrapper {
 		padding-bottom: 20px;
 		height: 100%;
diff --git a/resources/js/components/FilesView/MemberAvatar.vue b/resources/js/components/FilesView/MemberAvatar.vue
new file mode 100644
index 00000000..1bd08148
--- /dev/null
+++ b/resources/js/components/FilesView/MemberAvatar.vue
@@ -0,0 +1,38 @@
+<template>
+	<div class="user-preview">
+		<img
+			:style="{width: size + 'px', height: size + 'px'}"
+			v-if="member.data.attributes.avatar"
+			:src="member.data.attributes.avatar"
+			:alt="member.data.attributes.name"
+			class="user-image"
+		>
+		<TypedAvatar
+			v-else
+			:size="size"
+			:letter="member.data.attributes.name.substr(0, 1)"
+			:color="member.data.attributes.color"
+		/>
+	</div>
+</template>
+<script>
+	import TypedAvatar from "../Others/TypedAvatar"
+
+	export default {
+		name: 'MemberAvatar',
+		props: [
+			'member',
+			'size',
+		],
+		components: {
+			TypedAvatar,
+		},
+	}
+</script>
+
+<style lang="scss">
+
+	.user-image {
+		border-radius: 10px;
+	}
+</style>