Address empty Time field
After the merge of !22 (merged), the tests for mail are not accurate, as all tests faile because of an empty time field. Either make the empty time field not throw an error or build the test around that assumption with a default value.