diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index 0d675306b7..4f5a092103 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -344,7 +344,6 @@ AddSymlinkToHaikuImage home Desktop : /boot/home : Home ;
 AddDirectoryToHaikuImage home mail draft ;
 AddDirectoryToHaikuImage home mail in ;
 AddDirectoryToHaikuImage home mail out ;
-AddSymlinkToHaikuImage home config settings Mail : ../../../mail/in : mailbox ;
 
 # Deskbar Application links
 AddDirectoryToHaikuImage home config be Applications ;
diff --git a/src/servers/mail/DeskbarView.cpp b/src/servers/mail/DeskbarView.cpp
index 2c4e2a404a..7228ea970b 100644
--- a/src/servers/mail/DeskbarView.cpp
+++ b/src/servers/mail/DeskbarView.cpp
@@ -359,13 +359,17 @@ void
 DeskbarView::MouseUp(BPoint pos)
 {
 	if (fLastButtons & B_PRIMARY_MOUSE_BUTTON) {
-		entry_ref ref;
-		_GetNewQueryRef(ref);
+		if (OpenWithTracker(B_USER_SETTINGS_DIRECTORY, "Mail/mailbox")
+			!= B_OK) {
+			entry_ref ref;
+			_GetNewQueryRef(ref);
 
-		BMessenger trackerMessenger(kTrackerSignature);
-		BMessage message(B_REFS_RECEIVED);
-		message.AddRef("refs", &ref);
-		trackerMessenger.SendMessage(&message);
+			BMessenger trackerMessenger(kTrackerSignature);
+			BMessage message(B_REFS_RECEIVED);
+			message.AddRef("refs", &ref);
+
+			trackerMessenger.SendMessage(&message);
+		}
 	}
 
 	if (fLastButtons & B_TERTIARY_MOUSE_BUTTON)
@@ -444,6 +448,9 @@ DeskbarView::_CreateNewMailQuery(BEntry& query)
 	BString string("((" B_MAIL_ATTR_STATUS "==\"[nN][eE][wW]\")&&((BEOS:TYPE=="
 		"\"text/x-email\")||(BEOS:TYPE==\"text/x-partial-email\")))");
 	file.WriteAttrString("_trk/qrystr", &string);
+	file.WriteAttrString("_trk/qryinitstr", &string);
+	int32 mode = 'Fbyq';
+	file.WriteAttr("_trk/qryinitmode", B_INT32_TYPE, 0, &mode, sizeof(int32));
 	string = "E-mail";
 	file.WriteAttrString("_trk/qryinitmime", &string);
 	BNodeInfo(&file).SetType("application/x-vnd.Be-query");