Copy of mailcore::NetService

This one uses only `pull --rebase`.  It doesn't look like it fixed anything, in fact it looks worse.

Adds a proper copy method to NetService and improves the whitespace in those files.