1.1 --- a/src/accept.c	Thu Dec 04 09:45:12 2008 +0100
     1.2 +++ b/src/accept.c	Fri Dec 05 11:26:24 2008 +0100
     1.3 @@ -128,8 +128,7 @@
     1.4  				if (line1[0] == ' ' || line1[0] == '\t') {
     1.5  					/* continuation of 'folded' header: */
     1.6  					if (hdr) {
     1.7 -						hdr->header =
     1.8 -							g_strconcat(hdr->header, line1, NULL);
     1.9 +						hdr->header = g_strconcat(hdr->header, line1, NULL);
    1.10  					}
    1.11  
    1.12  				} else if (line1[0] == '\n') {
    1.13 @@ -196,14 +195,11 @@
    1.14  	}
    1.15  
    1.16  	/* set return path if local */
    1.17 -	if (msg->return_path == NULL) {
    1.18 -
    1.19 -		if (msg->received_host == NULL) {
    1.20 -			gchar *path = g_strdup_printf("<%s@%s>", passwd->pw_name, conf.host_name);
    1.21 -			DEBUG(3) debugf("setting return_path for local accept: %s\n", path);
    1.22 -			msg->return_path = create_address(path, TRUE);
    1.23 -			g_free(path);
    1.24 -		}
    1.25 +	if (msg->return_path == NULL && msg->received_host == NULL) {
    1.26 +		gchar *path = g_strdup_printf("<%s@%s>", passwd->pw_name, conf.host_name);
    1.27 +		DEBUG(3) debugf("setting return_path for local accept: %s\n", path);
    1.28 +		msg->return_path = create_address(path, TRUE);
    1.29 +		g_free(path);
    1.30  	}
    1.31  
    1.32  	/* -t option */
    1.33 @@ -262,7 +258,8 @@
    1.34  			case HEAD_ENVELOPE_TO:
    1.35  				if (flags & ACC_SAVE_ENVELOPE_TO) {
    1.36  					DEBUG(3) debugf("creating 'X-Orig-Envelope-To' header\n");
    1.37 -					msg->hdr_list = g_list_prepend(msg->hdr_list, create_header(HEAD_UNKNOWN, "X-Orig-Envelope-to: %s", hdr->value));
    1.38 +					msg->hdr_list = g_list_prepend(msg->hdr_list, create_header(HEAD_UNKNOWN,
    1.39 +					                               "X-Orig-Envelope-to: %s", hdr->value));
    1.40  				}
    1.41  				DEBUG(3) debugf("removing 'Envelope-To' header\n");
    1.42  				msg->hdr_list = g_list_remove_link(msg->hdr_list, hdr_node);