merge inbox-ios changes into fork