Adding features to keep Abemail running