unless ( $connected ) {
        return fail("connect to $smtp failed ($!) no (more) retries!")
    };

    {
        local $^W = 0; # don't warn on undefined variables
        # Add info to log variable
        $log .= "Server: $smtp Port: $port\n"
              . "From: $fromaddr\n"
              . "Subject: $mail{Subject}\n"
              ;
    }

    my($oldfh) = select(S); $| = 1; select($oldfh);

    socket_read()
        || return fail("Connection error from $smtp on port $port ($_)");
	socket_write("EHLO $smtp$CRLF")        

        || return fail("send EHLO error (lost connection?)");
    my $ehlo = socket_read();
    if ($ehlo) {
	    $log .= "socket_read ehlo: $ehlo \n";
        # parse EHLO response
        map {
            s/^\d+[- ]//;
            my ($k, $v) = split /\s+/, $_, 2;
            $esmtp{$k} = $v || 1 if $k;
        } split(/\n/, $ehlo);

      if ($port == 587) {		
        #Add STARTTLS code 
        socket_write("STARTTLS$CRLF")
             || return fail("send STARTTLS failed (lost connection?)");
        socket_read()
             || return fail(" $server_reply");
        socket_write("EHLO $smtp$CRLF")        
             || return fail("send EHLO error (lost connection?)");
		$ehlo = "";	 
 	    $ehlo = socket_read();
		if ($ehlo) {
            $log .= "2nd socket_read ehlo: $ehlo \n";			         
		    warn("parse 2nd EHLO response");
            map {
            s/^\d+[- ]//;
            my ($k, $v) = split /\s+/, $_, 2;
            $esmtp{$k} = $v || 1 if $k;
          } split(/\n/, $ehlo);
         }
	  }	 
	 }