*** sink.c.000	2008-08-12 14:51:57.000000000 +0100
--- sink.c	2008-08-12 15:26:37.000000000 +0100
*************** static int open_smtp_sink(struct query *
*** 872,878 ****
       * Also, if the hostname is a dotted quad, wrap it in square brackets.
       * Apparently this is required by RFC2821, section 4.1.3.
       */
!     if (!msg->return_path[0] || (msg->return_path[0] == '@'))
      {
        if (strchr(ctl->remotename,'@') || strchr(ctl->remotename,'!'))
        {
--- 872,878 ----
       * Also, if the hostname is a dotted quad, wrap it in square brackets.
       * Apparently this is required by RFC2821, section 4.1.3.
       */
!     if (!msg->return_path[0] || (msg->return_path[0] == '@') || (msg->return_path[strlen(msg->return_path)-1] == '@'))
      {
        if (strchr(ctl->remotename,'@') || strchr(ctl->remotename,'!'))
        {