[seam-commits] [seam/mail] fde7f0: more fixes to get closer to running tests