am fe218700: am 3a82ad59: Fix migration from Email1 to Email2 when using combined inbox.

* commit 'fe2187007af76fe8750367e7fdc6147efc6a0dea':
  Fix migration from Email1 to Email2 when using combined inbox.