Fix intermittent page redirection issues when moving a message in smartmobile view
Merge branch 'master' into imp_6_1