diff --git a/src/apps/mail/Content.cpp b/src/apps/mail/Content.cpp
index e174f74185..d990e2eb77 100644
--- a/src/apps/mail/Content.cpp
+++ b/src/apps/mail/Content.cpp
@@ -693,14 +693,14 @@ TContentView::MessageReceived(BMessage *msg)
 			break;
 		}
 
-		case M_QUOTE:
+		case M_ADD_QUOTE_LEVEL:
 		{
 			int32 start, finish;
 			fTextView->GetSelection(&start, &finish);
 			fTextView->AddQuote(start, finish);
 			break;
 		}
-		case M_REMOVE_QUOTE:
+		case M_SUB_QUOTE_LEVEL:
 		{
 			int32 start, finish;
 			fTextView->GetSelection(&start, &finish);
diff --git a/src/apps/mail/MailWindow.cpp b/src/apps/mail/MailWindow.cpp
index c41c5087e7..584dc455af 100644
--- a/src/apps/mail/MailWindow.cpp
+++ b/src/apps/mail/MailWindow.cpp
@@ -366,11 +366,11 @@ TMailWindow::TMailWindow(BRect rect, const char* title, TMailApp* app,
 		new BMessage(M_FIND_AGAIN), 'G'));
 	if (!fIncoming) {
 		menu->AddSeparatorItem();
-		fQuote = new BMenuItem(B_TRANSLATE("Quote"),
-			new BMessage(M_QUOTE), '\'');
+		fQuote = new BMenuItem(B_TRANSLATE("Increase quote level"),
+			new BMessage(M_ADD_QUOTE_LEVEL), '+');
 		menu->AddItem(fQuote);
-		fRemoveQuote = new BMenuItem(B_TRANSLATE("Remove quote"),
-			new BMessage(M_REMOVE_QUOTE), '\'', B_SHIFT_KEY);
+		fRemoveQuote = new BMenuItem(B_TRANSLATE("Decrease quote level"),
+			new BMessage(M_SUB_QUOTE_LEVEL), '-');
 		menu->AddItem(fRemoveQuote);
 
 		menu->AddSeparatorItem();
@@ -383,12 +383,12 @@ TMailWindow::TMailWindow(BRect rect, const char* title, TMailApp* app,
 	menu->AddSeparatorItem();
 	menu->AddItem(item = new BMenuItem(
 		B_TRANSLATE("Settings" B_UTF8_ELLIPSIS),
-		new BMessage(M_PREFS),','));
+		new BMessage(M_PREFS)));
 	item->SetTarget(be_app);
 	fMenuBar->AddItem(menu);
 	menu->AddItem(item = new BMenuItem(
 		B_TRANSLATE("Accounts" B_UTF8_ELLIPSIS),
-		new BMessage(M_ACCOUNTS),'-'));
+		new BMessage(M_ACCOUNTS)));
 	item->SetTarget(be_app);
 
 	// View Menu
@@ -1462,8 +1462,8 @@ TMailWindow::MessageReceived(BMessage* msg)
 			FindWindow::FindAgain(this);
 			break;
 
-		case M_QUOTE:
-		case M_REMOVE_QUOTE:
+		case M_ADD_QUOTE_LEVEL:
+		case M_SUB_QUOTE_LEVEL:
 			PostMessage(msg->what, fContentView);
 			break;
 
diff --git a/src/apps/mail/Messages.h b/src/apps/mail/Messages.h
index bd986055ec..ad2d9c9170 100644
--- a/src/apps/mail/Messages.h
+++ b/src/apps/mail/Messages.h
@@ -90,8 +90,8 @@ enum MENUS {
 
 	// edit
 	M_SELECT,
-	M_QUOTE,
-	M_REMOVE_QUOTE,
+	M_ADD_QUOTE_LEVEL,
+	M_SUB_QUOTE_LEVEL,
 	M_CHECK_SPELLING,
 	M_SIGNATURE,
 	M_RANDOM_SIG,