[continued from previous message]

*** 1073,1079 ****

if (NULL != (aliases2 =
get_alias_address_expanded(eliminated,mailer_info,aview,
! 1 /* Unquote */))) {

if (!elim_list) {
elim_list = aliases2;
--- 1589,1595 ----

if (NULL != (aliases2 =
get_alias_address_expanded(eliminated,mailer_info,aview,
! 1 /* Unquote */,NULL))) {

if (!elim_list) {
elim_list = aliases2;
***************
*** 1108,1115 ****
}

free_string(&eliminated);
! }
!
}
}

--- 1624,1630 ----
}

free_string(&eliminated);
! }
}
}

***************
*** 1127,1134 ****
if (result.addrs)
NEWPOS = addr_list_item_count(result.addrs);

-
-
if (!ptr->Textual) {

if (ptr->len == 1) {
--- 1642,1647 ----
***************
*** 1169,1175 ****
} else { /* have ptr->Textual */

struct addr_list * aliases = NULL;
!
struct string * utf8_temp;
unsigned char * utf8_textual;

--- 1682,1688 ----
} else { /* have ptr->Textual */

struct addr_list * aliases = NULL;
! enum alias_address_expand_result alias_result = alias_expand_fail;
struct string * utf8_temp;