fix mail storage