diff --git a/program/js/app.js b/program/js/app.js
index fa319bd48..ae5cf6884 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -354,7 +354,7 @@ function rcube_webmail()
           if (this.env.drafts_mailbox)
             this.env.compose_commands.push('savedraft')
 
-          this.enable_command(this.env.compose_commands, 'identities', 'responses', true);
+          this.enable_command(this.env.compose_commands, true);
 
           // add more commands (not enabled)
           $.merge(this.env.compose_commands, ['add-recipient', 'firstpage', 'previouspage', 'nextpage', 'lastpage']);
@@ -394,7 +394,6 @@ function rcube_webmail()
         }
         else if (this.env.action == 'bounce') {
           this.init_messageform_inputs();
-          this.enable_command('identities', true);
           this.env.compose_commands = [];
         }
         else if (this.env.action == 'get') {
@@ -8876,6 +8875,7 @@ function rcube_webmail()
       this.set_busy(true, 'loading');
 
     if (this.is_framed()) {
+      url = url.replace(/&_framed=1/, '');
       parent.rcmail.redirect(url, lock);
     }
     else {
diff --git a/skins/classic/templates/bounce.html b/skins/classic/templates/bounce.html
index 5e6abb90e..c359a1290 100644
--- a/skins/classic/templates/bounce.html
+++ b/skins/classic/templates/bounce.html
@@ -14,7 +14,7 @@
 		<td class="title"><label for="_from"><roundcube:label name="from" /></label></td>
 		<td class="editfield formlinks">
 			<roundcube:object name="composeHeaders" part="from" form="form" id="_from" tabindex="1" />
-			<a href="#identities" onclick="return rcmail.command('identities')" tabindex="1"><roundcube:label name="editidents" /></a>
+			<a href="#identities" onclick="return rcmail.command('switch-task', 'settings/identities')" tabindex="1"><roundcube:label name="editidents" /></a>
 		</td>
 	</tr>
 	<tr>
diff --git a/skins/classic/templates/compose.html b/skins/classic/templates/compose.html
index 9ebf1ab74..e14709799 100644
--- a/skins/classic/templates/compose.html
+++ b/skins/classic/templates/compose.html
@@ -212,7 +212,7 @@
         <roundcube:object name="responseslist" id="responseslist" tagname="ul" itemclass="active" />
         <li><label class="comment"><roundcube:label name="manageresponses" /></label></li>
         <roundcube:button command="save-response" type="link-menuitem" label="newresponse" classAct="active" unselectable="on" />
-        <roundcube:button command="responses" type="link-menuitem" label="editresponses" classAct="active" />
+        <roundcube:button name="responses" type="link-menuitem" label="editresponses" class="active" onclick="return rcmail.command('switch-task', 'settings/responses')" />
     </ul>
 </div>
 
diff --git a/skins/elastic/templates/bounce.html b/skins/elastic/templates/bounce.html
index 9a021833b..99c6aaef7 100644
--- a/skins/elastic/templates/bounce.html
+++ b/skins/elastic/templates/bounce.html
@@ -13,7 +13,7 @@
 					<div class="input-group">
 						<roundcube:object name="composeHeaders" part="from" id="_from" form="form" tabindex="1" class="form-control" />
 						<span class="input-group-append">
-							<a href="#identities" onclick="return rcmail.command('identities')" class="input-group-text icon edit" title="<roundcube:label name="editidents" />" tabindex="1"><span class="inner"><roundcube:label name="editidents" /></span></a>
+							<a href="#identities" onclick="return rcmail.command('switch-task', 'settings/identities')" class="input-group-text icon edit" title="<roundcube:label name="editidents" />" tabindex="1"><span class="inner"><roundcube:label name="editidents" /></span></a>
 					</div>
 				</div>
 			</div>
diff --git a/skins/elastic/templates/compose.html b/skins/elastic/templates/compose.html
index e48ec122e..1859ef90b 100644
--- a/skins/elastic/templates/compose.html
+++ b/skins/elastic/templates/compose.html
@@ -244,7 +244,7 @@
 		<roundcube:object name="responseslist" id="responseslist" tagname="ul" itemclass="active" />
 		<li role="separator" class="separator"><label><roundcube:label name="manageresponses" /></label></li>
 		<roundcube:button command="save-response" type="link-menuitem" label="newresponse" class="create responses" classAct="create responses active" unselectable="on" />
-		<roundcube:button command="responses" type="link-menuitem" label="editresponses" class="edit responses" classAct="edit responses active" />
+		<roundcube:button name="responses" type="link-menuitem" label="editresponses" class="edit responses active" onclick="return rcmail.command('switch-task', 'settings/responses')" />
 	</ul>
 </div>
 
diff --git a/skins/larry/templates/bounce.html b/skins/larry/templates/bounce.html
index b3e21fc53..5c6a31ec4 100644
--- a/skins/larry/templates/bounce.html
+++ b/skins/larry/templates/bounce.html
@@ -16,7 +16,7 @@
 		<td class="title"><label for="_from"><roundcube:label name="from" /></label></td>
 		<td class="editfield">
 			<roundcube:object name="composeHeaders" part="from" form="form" id="_from" tabindex="1" />
-			<a href="#identities" onclick="return rcmail.command('identities')" class="iconlink edit" tabindex="1"><roundcube:label name="editidents" /></a>
+			<a href="#identities" onclick="return rcmail.command('switch-task', 'settings/identities')" class="iconlink edit" tabindex="1"><roundcube:label name="editidents" /></a>
 		</td>
 	</tr>
 	<tr>
diff --git a/skins/larry/templates/compose.html b/skins/larry/templates/compose.html
index 8f4688c75..df86b6ef5 100644
--- a/skins/larry/templates/compose.html
+++ b/skins/larry/templates/compose.html
@@ -213,7 +213,7 @@
 		<roundcube:object name="responseslist" id="responseslist" tagname="ul" itemclass="active" />
 		<li role="separator" class="separator"><label><roundcube:label name="manageresponses" /></label></li>
 		<roundcube:button command="save-response" type="link-menuitem" label="newresponse" classAct="active" unselectable="on" />
-		<roundcube:button command="responses" type="link-menuitem" label="editresponses" classAct="active" />
+		<roundcube:button name="responses" type="link-menuitem" label="editresponses" class="active" onclick="return rcmail.command('switch-task', 'settings/responses')" />
 	</ul>
 </div>