diff --git a/program/localization/de_CH/labels.inc b/program/localization/de_CH/labels.inc
index 5c0aa9d19..ac38ff607 100644
--- a/program/localization/de_CH/labels.inc
+++ b/program/localization/de_CH/labels.inc
@@ -101,7 +101,7 @@ $labels['replytoallmessage'] = 'Antwort an Absender und alle Empfänger verfasse
 $labels['forwardmessage'] = 'Nachricht weiterleiten';
 $labels['deletemessage'] = 'Nachricht löschen';
 $labels['movemessagetotrash'] = 'Nachricht in den Papierkorb verschieben';
-$labels['printmessage'] = 'Diese Nachricht drucken';
+$labels['printmessage'] = 'Nachricht drucken';
 $labels['previousmessage'] = 'Vorherige Nachricht anzeigen';
 $labels['previousmessages'] = 'Vorherige Nachrichten anzeigen';
 $labels['firstmessage'] = 'Die erste Nachricht anzeigen';
@@ -134,7 +134,9 @@ $labels['unlimited'] = 'unlimitiert';
 $labels['quicksearch'] = 'Schnellsuche';
 $labels['resetsearch'] = 'Löschen';
 $labels['openinextwin'] = 'In neuem Fenster öffnen';
+$labels['emlsave'] = 'Herunterladen (.eml)';
 $labels['compose'] = 'Neue Nachricht verfassen';
+$labels['editasnew'] = 'Als neue Nachricht öffnen';
 $labels['savemessage'] = 'Nachricht speichern';
 $labels['sendmessage'] = 'Nachricht jetzt senden';
 $labels['addattachment'] = 'Datei anfügen';
diff --git a/program/localization/de_DE/labels.inc b/program/localization/de_DE/labels.inc
index 8ffafbeb3..fe8777cc5 100644
--- a/program/localization/de_DE/labels.inc
+++ b/program/localization/de_DE/labels.inc
@@ -138,6 +138,7 @@ $labels['msgtext'] = 'Nachricht';
 $labels['openinextwin'] = 'In neuem Fenster öffnen';
 $labels['emlsave'] = 'Lokal speichern (.eml)';
 $labels['compose'] = 'Neue Nachricht verfassen';
+$labels['editasnew'] = 'Als neue Nachricht öffnen';
 $labels['savemessage'] = 'Nachricht speichern';
 $labels['sendmessage'] = 'Nachricht jetzt senden';
 $labels['addattachment'] = 'Datei anfügen';
diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc
index 8cf819e9c..c3181b2d6 100644
--- a/program/localization/en_US/labels.inc
+++ b/program/localization/en_US/labels.inc
@@ -168,10 +168,11 @@ $labels['searchmod']  = 'Search modifiers';
 $labels['msgtext']  = 'Entire message';
 
 $labels['openinextwin'] = 'Open in new window';
-$labels['emlsave'] = 'Save (.eml)';
+$labels['emlsave'] = 'Download (.eml)';
 
 // message compose
 $labels['compose']        = 'Compose a message';
+$labels['editasnew']      = 'Edit as new';
 $labels['savemessage']    = 'Save this draft';
 $labels['sendmessage']    = 'Send now';
 $labels['addattachment']  = 'Attach a file';
diff --git a/skins/default/images/messageactions.gif b/skins/default/images/messageactions.gif
index da981cbc8..5f0a533fe 100644
Binary files a/skins/default/images/messageactions.gif and b/skins/default/images/messageactions.gif differ
diff --git a/skins/default/images/messageactions.png b/skins/default/images/messageactions.png
index 3c9bce396..de1349812 100644
Binary files a/skins/default/images/messageactions.png and b/skins/default/images/messageactions.png differ
diff --git a/skins/default/includes/messagemenu.html b/skins/default/includes/messagemenu.html
index c5eadb6d1..ad2a6c61e 100644
--- a/skins/default/includes/messagemenu.html
+++ b/skins/default/includes/messagemenu.html
@@ -2,7 +2,7 @@
   <ul class="toolbarmenu">
     <li><roundcube:button class="printlink" command="print" label="printmessage" classAct="printlink active" /></li>
     <li><roundcube:button class="downloadlink" command="download" label="emlsave" classAct="downloadlink active" /></li>
-    <li><roundcube:button class="editlink" command="edit" label="edit" classAct="editlink active" /></li>
+    <li><roundcube:button class="editlink" command="edit" label="editasnew" classAct="editlink active" /></li>
     <li class="separator_below"><roundcube:button class="sourcelink" command="viewsource" label="viewsource" classAct="sourcelink active" /></li>
     <li><roundcube:button class="openlink" command="open" label="openinextwin" target="_blank" classAct="openlink active" /></li>
     <roundcube:container name="messagemenu" id="messagemenu" />
diff --git a/skins/default/mail.css b/skins/default/mail.css
index 7b660d270..13a8a624b 100644
--- a/skins/default/mail.css
+++ b/skins/default/mail.css
@@ -159,6 +159,11 @@ ul.toolbarmenu li.separator_above
   background-position: 1px -53px;
 }
 
+#messagemenu li a.editlink
+{
+  background-position: 1px -71px;
+}
+
 #markmessagemenu a.readlink
 {
   background: url('images/icons/dot.png') no-repeat 2px;