diff --git a/skins/default/mail.css b/skins/default/mail.css
index 2f83578ac..e58af7d7a 100644
--- a/skins/default/mail.css
+++ b/skins/default/mail.css
@@ -750,10 +750,16 @@ div.message-htmlpart div.rcmBody
 
 /** message compose styles */
 
+#compose-toolbar
+{
+  white-space: nowrap;
+}
+
 #priority-selector,
 #receipt-selector
 {
   padding-left: 30px;
+  white-space: nowrap;
 }
 
 #compose-container
diff --git a/skins/default/templates/compose.html b/skins/default/templates/compose.html
index ac71d9b30..a7399a08b 100644
--- a/skins/default/templates/compose.html
+++ b/skins/default/templates/compose.html
@@ -55,7 +55,7 @@ function rcmail_prev_sibling(elm)
 
 <div id="messagetoolbar">
 <table border="0" cellspacing="0" cellpadding="0"><tr>
-<td>
+<td id="compose-toolbar">
   <roundcube:button command="list" image="/images/buttons/back_act.png" imageSel="/images/buttons/back_sel.png" imageAct="/images/buttons/back_act.png" width="32" height="32" title="backtolist" />
   <roundcube:button command="send" imageSel="/images/buttons/send_sel.png" imageAct="/images/buttons/send_act.png" imagePas="/images/buttons/send_pas.png" width="32" height="32" title="sendmessage" />
   <roundcube:button command="spellcheck" imageSel="/images/buttons/spellcheck_sel.png" imageAct="/images/buttons/spellcheck_act.png" imagePas="/images/buttons/spellcheck_pas.png" width="32" height="32" title="checkspelling" />
@@ -132,7 +132,7 @@ function rcmail_prev_sibling(elm)
 
 <table border="0" cellspacing="0" width="100%" summary=""><tbody>
 <tr>
-<td style="white-space:nowrap">
+<td>
 <roundcube:button type="input" command="send" class="button" label="sendmessage" tabindex="8" />
 <roundcube:button type="input" command="list" class="button" label="cancel" tabindex="9" />
 </td>