Incorrect Bounce Type on SMTP connection error

Sending a Mailing via an un-connectable SMTP server results in the first recipient being bounced with the reason "Connection refused" and the rest with "Unknown bounce type: Could not parse bounce email" .

This is not good because the "Unknown bounce type: Could not parse bounce email" results in email addresses going on Hold . This is also not consistent because the first recipient, the one bounced with the reason "Connection refused", does not go on Hold - although the reason behind these bounces is the same.

I traced the error to a string "not connected" originating from Line 311 of packages/Net/Socket.php . This string/pattern should be added after Line 696 in xml/templates/civicrm_data.tpl as it is a consequence of the pattern "connection (refused|timed out)" .

I did some minimal testing of 3.1.3 and it was putting the addresses on Hold as well under the same circumstances. I wonder if its the same issue...