diff --git a/src/apps/mail/MailWindow.cpp b/src/apps/mail/MailWindow.cpp
index c43c79d50f..c354bbe443 100644
--- a/src/apps/mail/MailWindow.cpp
+++ b/src/apps/mail/MailWindow.cpp
@@ -48,10 +48,7 @@ All rights reserved.
 #include <Debug.h>
 #include <E-mail.h>
 #include <InterfaceKit.h>
-#include <OpenWithTracker.h>
-#ifdef __HAIKU__
-#  include <PathMonitor.h>
-#endif
+#include <PathMonitor.h>
 #include <Roster.h>
 #include <Screen.h>
 #include <StorageKit.h>
@@ -70,12 +67,6 @@ All rights reserved.
 
 #include <CharacterSetRoster.h>
 
-using namespace BPrivate ;
-
-#ifdef HAIKU_TARGET_PLATFORM_BEOS
-	#include <netdb.h>
-#endif
-
 #include "ButtonBar.h"
 #include "Content.h"
 #include "Enclosures.h"
@@ -95,6 +86,9 @@ using namespace BPrivate ;
 #include "Words.h"
 
 
+using namespace BPrivate;
+
+
 const char *kUndoStrings[] = {
 	MDR_DIALECT_CHOICE ("Undo","Z) 取り消し"),
 	MDR_DIALECT_CHOICE ("Undo Typing","Z) 取り消し（入力）"),
@@ -639,10 +633,6 @@ TMailWindow::BuildButtonBar()
 			_AddReadButton();
 		}
 	}
-	bbar->AddButton(MDR_DIALECT_CHOICE ("Inbox","受信箱"), 36,
-		new BMessage(M_OPEN_MAIL_BOX));
-	bbar->AddButton(MDR_DIALECT_CHOICE ("Mail","メール"), 32,
-		new BMessage(M_OPEN_MAIL_FOLDER));
 
 	bbar->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
 	bbar->Hide();
@@ -1474,14 +1464,6 @@ TMailWindow::MessageReceived(BMessage *msg)
 				SaveTrackerPosition(fRef);
 			break;
 
-		case M_OPEN_MAIL_FOLDER:
-			OpenWithTracker(B_USER_DIRECTORY, kMailFolder);
-			break;
-
-		case M_OPEN_MAIL_BOX:
-			OpenWithTracker(B_USER_SETTINGS_DIRECTORY, kMailboxSymlink);
-			break;
-
 		case RESET_BUTTONS:
 			fChanged = false;
 			fFieldState = 0;
diff --git a/src/apps/mail/Messages.h b/src/apps/mail/Messages.h
index 2cef192ee9..a381bd2c92 100644
--- a/src/apps/mail/Messages.h
+++ b/src/apps/mail/Messages.h
@@ -87,8 +87,6 @@ enum MENUS {
 	M_CLOSE_SAME,
 	M_CLOSE_CUSTOM,
 	M_STATUS,
-	M_OPEN_MAIL_BOX,
-	M_OPEN_MAIL_FOLDER,
 
 	// edit
 	M_SELECT,