diff --git a/skins/larry/templates/compose.html b/skins/larry/templates/compose.html
index 0c1b81759..a4c9fc10d 100644
--- a/skins/larry/templates/compose.html
+++ b/skins/larry/templates/compose.html
@@ -108,9 +108,9 @@
 </table>
 
 <div id="composebuttons" class="formbuttons">
-	<roundcube:button type="input" command="send" class="button mainaction" label="sendmessage" tabindex="10" />
-	<roundcube:button type="input" command="savedraft" class="button" label="savemessage" tabindex="10" />
-	<roundcube:button type="input" command="list" class="button" label="cancel" tabindex="11" />
+	<roundcube:button type="input" command="send" class="button mainaction" label="sendmessage" tabindex="11" />
+	<roundcube:button type="input" command="savedraft" class="button" label="savemessage" tabindex="12" />
+	<roundcube:button type="input" command="list" class="button" label="cancel" tabindex="13" />
 </div>
 
 </div>
@@ -126,7 +126,7 @@
 		<roundcube:if condition="!in_array('htmleditor', (array)config:dont_override)" />
 		<span class="composeoption">
 			<label><roundcube:label name="editortype" />
-				<roundcube:object name="editorSelector" editorid="composebody" tabindex="12" /></label>
+				<roundcube:object name="editorSelector" editorid="composebody" tabindex="14" /></label>
 		</span>
 		<roundcube:endif />
 		<span class="composeoption">
@@ -153,7 +153,7 @@
 	</div>
 	<div id="compose-attachments" class="rightcol">
 		<div style="text-align:center; margin-bottom:20px">
-			<roundcube:button name="addattachment" type="input" class="button" classSel="button pressed" label="addattachment" onclick="UI.show_uploadform();return false" />
+			<roundcube:button name="addattachment" type="input" class="button" classSel="button pressed" label="addattachment" onclick="UI.show_uploadform();return false" tabindex="10" />
 		</div>
 		<roundcube:object name="composeAttachmentList" id="attachment-list" class="attachmentslist" cancelIcon="/images/0.gif" />
 	</div>