diff --git a/skins/default/templates/compose.html b/skins/default/templates/compose.html
index 3b9cd4003..614d8862b 100644
--- a/skins/default/templates/compose.html
+++ b/skins/default/templates/compose.html
@@ -70,7 +70,7 @@
 	    </tr><tr>
 		<td class="title"><roundcube:label name="editortype" /></td>
 		<td>
-		    <div id="editor-select"><roundcube:object name="editorSelector" editorid="compose-body" /></div>
+		    <div id="editor-select"><roundcube:object name="editorSelector" editorid="compose-body" tabindex="7" /></div>
 		    <div id="spellcheck-control"></div>
 		</td>
 	    </tr>
@@ -78,15 +78,15 @@
 	</table>
     </div>
     <div id="compose-div">
-	<roundcube:object name="composeBody" id="compose-body" form="form" cols="70" rows="20" tabindex="7" />
+	<roundcube:object name="composeBody" id="compose-body" form="form" cols="70" rows="20" tabindex="8" />
 	<table border="0" cellspacing="0" summary="" style="width:100%; margin-top: 5px;"><tbody>
 	    <tr>
 		<td style="white-space: nowrap">
-		    <roundcube:button type="input" command="send" class="button mainaction" label="sendmessage" tabindex="8" />
-		    <roundcube:button type="input" command="list" class="button" label="cancel" tabindex="9" />
+		    <roundcube:button type="input" command="send" class="button mainaction" label="sendmessage" tabindex="9" />
+		    <roundcube:button type="input" command="list" class="button" label="cancel" tabindex="10" />
 		</td>
 		<td style="text-align:right; white-space: nowrap">
-		    <label><roundcube:label name="savesentmessagein" />: <roundcube:object name="storetarget" maxlength="30" tabindex="10" /></label>
+		    <label><roundcube:label name="savesentmessagein" />: <roundcube:object name="storetarget" maxlength="30" tabindex="11" /></label>
 		</td>
 	    </tr>
 	</tbody></table>