diff --git a/src/apps/mail/Header.cpp b/src/apps/mail/Header.cpp
index 3165d1fd82..8681733233 100644
--- a/src/apps/mail/Header.cpp
+++ b/src/apps/mail/Header.cpp
@@ -112,6 +112,7 @@ public:
 	virtual	void				AttachedToWindow();
 	virtual	void				SetEnabled(bool enabled);
 	virtual	void				Draw(BRect updateRect);
+	virtual	void				MessageReceived(BMessage* message);
 
 private:
 			void				_UpdateTextViewColors();
@@ -223,6 +224,25 @@ HeaderTextControl::Draw(BRect updateRect)
 }
 
 
+void
+HeaderTextControl::MessageReceived(BMessage* message)
+{
+	switch (message->what) {
+		case M_SELECT:
+		{
+			BTextView* textView = TextView();
+			if (textView != NULL)
+				textView->SelectAll();
+			break;
+		}
+
+		default:
+			BTextControl::MessageReceived(message);
+			break;
+	}
+}
+
+
 void
 HeaderTextControl::_UpdateTextViewColors()
 {