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

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