Finished “mail” features + little optimizations