Revert "Pop3Server"

This reverts commit 7191130fade8424a2305987fb47ef32304b4625b.