Fixed some inbox bugs