Back button should bring you back to search

Steps To Reproduce:

1. Search “from: user”.
2. Click on a matching message.
3. Go back
4. User is taken back to the main server.

Expected Behavior: after step 3, user should be taken back to search to resume the search. This is how the older UI behaved.