Fix reading of emails archives

Change-Id: I3a04877f19a06bb641b1b6dc3b82c0414de56c55