[MERGE] mail: gracefully handle missing user signature