diff --git a/src/components/MailboxMessage.vue b/src/components/MailboxThread.vue
similarity index 97%
rename from src/components/MailboxMessage.vue
rename to src/components/MailboxThread.vue
index af4aa7b021..ac74a34f5f 100644
--- a/src/components/MailboxMessage.vue
+++ b/src/components/MailboxThread.vue
@@ -56,7 +56,7 @@
 				</template>
 			</AppContentList>
 			<NewMessageDetail v-if="newMessage" />
-			<Message v-else-if="showMessage" @delete="deleteMessage" />
+			<Thread v-else-if="showMessage" @delete="deleteMessage" />
 			<NoMessageSelected v-else-if="hasMessages && !isMobile" />
 		</div>
 	</AppContent>
@@ -74,27 +74,27 @@ import Vue from 'vue'
 import AppDetailsToggle from './AppDetailsToggle'
 import logger from '../logger'
 import Mailbox from './Mailbox'
-import Message from './Message'
 import NewMessageDetail from './NewMessageDetail'
 import NoMessageSelected from './NoMessageSelected'
 import { normalizedEnvelopeListId } from '../store/normalization'
+import Thread from './Thread'
 import { UNIFIED_ACCOUNT_ID, UNIFIED_INBOX_ID } from '../store/constants'
 
 export default {
-	name: 'MailboxMessage',
+	name: 'MailboxThread',
 	directives: {
 		infiniteScroll,
 	},
 	components: {
 		AppContent,
-		Popover,
 		AppContentList,
 		AppDetailsToggle,
 		Mailbox,
-		Message,
 		NewMessageDetail,
 		NoMessageSelected,
+		Popover,
 		SectionTitle,
+		Thread,
 	},
 	mixins: [isMobile],
 	props: {
diff --git a/src/components/Message.vue b/src/components/Thread.vue
similarity index 99%
rename from src/components/Message.vue
rename to src/components/Thread.vue
index 870463a156..4db5642ab7 100644
--- a/src/components/Message.vue
+++ b/src/components/Thread.vue
@@ -128,7 +128,7 @@ import MessageAttachments from './MessageAttachments'
 import ThreadMessage from './ThreadMessage'
 
 export default {
-	name: 'Message',
+	name: 'Thread',
 	components: {
 		ActionButton,
 		Actions,
diff --git a/src/views/Home.vue b/src/views/Home.vue
index acc2d39214..0e6ed142c7 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -1,23 +1,23 @@
 <template>
 	<Content v-shortkey.once="['c']" app-name="mail" @shortkey.native="onNewMessage">
 		<Navigation />
-		<MailboxMessage v-if="activeAccount" :account="activeAccount" :mailbox="activeMailbox" />
+		<MailboxThread v-if="activeAccount" :account="activeAccount" :mailbox="activeMailbox" />
 	</Content>
 </template>
 
 <script>
 import Content from '@nextcloud/vue/dist/Components/Content'
 
-import MailboxMessage from '../components/MailboxMessage'
 import isMobile from '@nextcloud/vue/dist/Mixins/isMobile'
 import logger from '../logger'
+import MailboxThread from '../components/MailboxThread'
 import Navigation from '../components/Navigation'
 
 export default {
 	name: 'Home',
 	components: {
 		Content,
-		MailboxMessage,
+		MailboxThread,
 		Navigation,
 	},
 	mixins: [isMobile],