When are logging out redirect them back to the previous conversation

Last time, I promise :smile: But now in a single commit. I really believe this is the correct behaviour!

ps. My editor automatically strips blank lines so that is why line 405 and 413 are being changed as well.