diff --git a/portlets/mail-portlet/docroot/js/main.js b/portlets/mail-portlet/docroot/js/main.js
index 904f307b0aa..22c7c279b0b 100644
--- a/portlets/mail-portlet/docroot/js/main.js
+++ b/portlets/mail-portlet/docroot/js/main.js
@@ -563,7 +563,7 @@ AUI.add(
 								instance.messagesContainer.all('.move-messages').on(
 									'click',
 									function(event) {
-										var folderId = A.Lang.String.trim(event.currentTarget.text());
+										var folderId = A.Lang.String.trim(event.currentTarget.getData('folderid'));
 
 										var messageIds = instance._getSelectedMessageIds();
 
diff --git a/portlets/mail-portlet/docroot/select_folder.jspf b/portlets/mail-portlet/docroot/select_folder.jspf
index b03aa0374ab..93eb0c92de8 100644
--- a/portlets/mail-portlet/docroot/select_folder.jspf
+++ b/portlets/mail-portlet/docroot/select_folder.jspf
@@ -14,13 +14,17 @@
  */
 --%>
 
+<%@page import="java.util.HashMap"%>
+<%@page import="java.util.Map"%>
 <%
 List<Folder> folders = FolderLocalServiceUtil.getFolders(accountId);
+Map<String, Long> data = new HashMap<String, Long>();
 
 for (Folder curFolder : folders) {
+	data.put("folderid", curFolder.getFolderId());
 %>
 
-	<aui:nav-item cssClass="move-messages" label="<%= curFolder.getDisplayName() %>" />
+	<aui:nav-item cssClass="move-messages" label="<%= curFolder.getDisplayName() %>" data="<%= data %>" />
 
 <%
 }