add private mail config; cleanup