Fix a bug in delivery to inbox
Merge branch 'deliver-inbox-fix'

* deliver-inbox-fix:
  Fix a bug in delivery to inbox