diff --git a/dev/Model/Message.js b/dev/Model/Message.js
index 4086be5cd..027243891 100644
--- a/dev/Model/Message.js
+++ b/dev/Model/Message.js
@@ -448,13 +448,6 @@ export class MessageModel extends AbstractModel {
 		this.popupMessage(true);
 	}
 
-	/**
-	 * @returns {string}
-	 */
-	generateUid() {
-		return this.folder + '/' + this.uid;
-	}
-
 	/**
 	 * @returns {MessageModel}
 	 *//*
diff --git a/dev/View/User/MailBox/MessageList.js b/dev/View/User/MailBox/MessageList.js
index 38cd4f535..be5441b1b 100644
--- a/dev/View/User/MailBox/MessageList.js
+++ b/dev/View/User/MailBox/MessageList.js
@@ -243,7 +243,7 @@ export class MailMessageList extends AbstractViewRight {
 
 		this.selector.on('MiddleClick', message => populateMessageBody(message, true));
 
-		this.selector.on('ItemGetUid', message => (message ? message.generateUid() : ''));
+		this.selector.on('ItemGetUid', message => (message ? message.folder + '/' + message.uid : ''));
 
 		this.selector.on('canSelect', () => MessagelistUserStore.canSelect());