Merged Synology fix 20130129-0058

Fixed an issue where the configuration of external POP3 mailbox settings
were not present after you upgrade Mail Station.