Revert "Clean Up"

This reverts commit 8e87d336c22b131e33e885113ba7ef1ed9c84ae1.

Conflicts:
	MessageMan.userprefs