This patch finalizes the switch to port 587 for email submission that was started with commit 166c57.