Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

2 files changed, 2 insertions, 1 deletions

diff --git a/lib/mailbox.php b/lib/mailbox.php
index 8d5d44e49..e8323dc28 100644
--- a/lib/mailbox.php
+++ b/lib/mailbox.php
@@ -63,6 +63,8 @@ class MailboxAction extends PersonalAction
             $this->page = 1;
         }
 
+        common_set_returnto($this->selfUrl());
+
         return true;
     }
 
diff --git a/lib/personal.php b/lib/personal.php
index 900df0257..e46350c63 100644
--- a/lib/personal.php
+++ b/lib/personal.php
@@ -55,7 +55,6 @@ class PersonalAction extends Action
     function handle($args)
     {
         parent::handle($args);
-        common_set_returnto($this->selfUrl());
     }
 
 }