Pulled ReplyController changes from PrivateMessages branch