* set the correct server options from the preset data,

* set the correct server options from the preset data,
  and set the right port number as well; i restructured the code a bit,
  the problem was that (apparently) the easy setup wizard did not set the
  port number; also, modest-presets confused && and & for bitwise-and
  somehow
* add explicit port number argument to modest_account_mgr_add_server_account

pmo-trunk-r1921