diff --git a/src/app/pages/mail/detail/MailDetailCtrl.js b/src/app/pages/mail/detail/MailDetailCtrl.js
index 906e7bc..24fb944 100644
--- a/src/app/pages/mail/detail/MailDetailCtrl.js
+++ b/src/app/pages/mail/detail/MailDetailCtrl.js
@@ -14,7 +14,7 @@
     vm.mail = mailMessages.getMessageById($stateParams.id);
     vm.back = function(){
       $state.go('mail.label', {
-        label: 'inbox'
+        label: $stateParams.label
       })
     }
   }
diff --git a/src/app/pages/mail/list/MailListCtrl.js b/src/app/pages/mail/list/MailListCtrl.js
index 4ee4333..58c2f77 100644
--- a/src/app/pages/mail/list/MailListCtrl.js
+++ b/src/app/pages/mail/list/MailListCtrl.js
@@ -12,6 +12,7 @@
   function MailListCtrl($stateParams,  mailMessages) {
     var vm = this;
     vm.messages = mailMessages.getMessagesByLabel($stateParams.label);
+    vm.label = $stateParams.label;
   }
 
 })();
diff --git a/src/app/pages/mail/list/mailList.html b/src/app/pages/mail/list/mailList.html
index 6af01ed..040b6a1 100644
--- a/src/app/pages/mail/list/mailList.html
+++ b/src/app/pages/mail/list/mailList.html
@@ -23,7 +23,7 @@
     <table>
       <tr ng-repeat="m in listCtrl.messages track by m.id | orderBy:'-date'"
           class="side-message-navigation-item little-human shineHover {{m.tag}}"
-          ui-sref="mail.detail({id: m.id})">
+          ui-sref="mail.detail({id: m.id, label: listCtrl.label})">
         <td>
           <div class="mail-checkbox">
             <label class="checkbox-inline custom-checkbox nowrap margin-left">
diff --git a/src/app/pages/mail/mail.module.js b/src/app/pages/mail/mail.module.js
index 5d7bfd7..43aabae 100644
--- a/src/app/pages/mail/mail.module.js
+++ b/src/app/pages/mail/mail.module.js
@@ -23,7 +23,7 @@
         controller: "MailListCtrl",
         controllerAs: "listCtrl"
       }).state('mail.detail', {
-        url: '/detail/:id',
+        url: '/:label/:id',
         templateUrl: 'app/pages/mail/detail/mailDetail.html',
         controller: "MailDetailCtrl",
         controllerAs: "detailCtrl"