Prefer port smtp over port 587 when sending mail.

* mail/smtpmail.el (smtpmail-query-smtp-server): Try port 25
before 587, since it appears that that's more likely to work for
more people.

lisp/ChangeLog

 2011-08-02  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+	* mail/smtpmail.el (smtpmail-query-smtp-server): Try port 25
+	before 587, since it appears that that's more likely to work for
+	more people.
+
 	* cus-edit.el (custom-file): When running under emacs -q, always
 	refuse to save the customisations, even if the .emacs file doesn't
 	exist.

lisp/mail/smtpmail.el

@@ -589,7 +589,7 @@ The list is in preference order.")
 
 (defun smtpmail-query-smtp-server ()
   (let ((server (read-string "Outgoing SMTP mail server: "))
-	(ports '(587 "smtp"))
+	(ports '("smtp" 587))
 	stream port)
     (when (and smtpmail-smtp-server
 	       (not (member smtpmail-smtp-server ports)))