Merge "Properly store incoming messages on incoming sessions"