Handle emails without content better