diff --git a/mozilla/calendar/lightning/content/messenger-overlay-sidebar.js b/mozilla/calendar/lightning/content/messenger-overlay-sidebar.js
index 187ae050e3b..dea8b0f2688 100644
--- a/mozilla/calendar/lightning/content/messenger-overlay-sidebar.js
+++ b/mozilla/calendar/lightning/content/messenger-overlay-sidebar.js
@@ -663,6 +663,19 @@ function toggleTasksInView() {
     currentView().goToDay(currentView().selectedDay);
 }
 
+gSelectFolder = SelectFolder;
+gSelectMessage = SelectMessage;
+
+SelectFolder = function(folderUri) {
+    document.getElementById("switch2mail").doCommand();
+    gSelectFolder(folderUri);
+}
+
+SelectMessage = function(messageUri) {
+    document.getElementById("switch2mail").doCommand();
+    gSelectMessage(messageUri);
+}
+
 document.getElementById("displayDeck").
     addEventListener("select", LtnObserveDisplayDeckChange, true);