[continued from previous message]

! struct string * message =
! format_string(CATGETS(elm_msg_cat, FastmailSet,
! FastmailFromNameOptChange,
! "From name -f %S changed From"),
! from_string);
!
! addr_list_replace_item(mailing_headers.from.addrs,0,
! new_addr,group);
!
! free_address(&new_addr);
!
! From2_field_string = addr_list_to_string(mailing_headers.from.addrs);
!
!
! if (From_field_string) {
!
! elm_append_message(&message,
! CATGETS(elm_msg_cat, FastmailSet,
! FastmailFromNameSource,
! " value %S"),
! From_field_string);
!
! free_string(& From_field_string);
! }
!
! if (From2_field_string) {
! elm_append_message(&message,
! CATGETS(elm_msg_cat, FastmailSet,
! FastmailFromNameResult,
! " to value %S"),
! From2_field_string);
!
! free_string(& From2_field_string);
! }
!
! lib_error(FRM("%S"),message);
!
! free_string(& message);
} else {
struct string * From_field_string =
addr_list_to_string(mailing_headers.from.addrs); ***************
*** 1169,1175 ****

filename = tempname = elm_message(FRM("%selmfstmail%d"),tmp,getpid());

! F = safeopen_rdwr(filename);

if (F) {
int ch;
--- 1284,1290 ----

filename = tempname = elm_message(FRM("%selmfstmail%d"),tmp,getpid());

! F = safeopen_rdwr(filename,&file_errcode);

if (F) {
int ch;
***************
*** 1240,1245 ****
--- 1355,1364 ----

} else {
F = fopen(filename,"r");
+
+ if (!F)
+ file_errcode = errno;
+
ext = strrchr (filename, '.');
if (ext)
ext++;
***************
*** 1247,1258 ****
}

if (!F) {
- int err = errno;
-
lib_error(CATGETS(elm_msg_cat, FastmailSet,
FastmailCantFind,
"Error: can't find file %s: %s\n"),
! filename,strerror(err));
#ifdef EX_NOINPUT
exitcode = EX_NOINPUT; /* Better exit code */
#else
--- 1366,1375 ----
}

if (!F) {
lib_error(CATGETS(elm_msg_cat, FastmailSet,
FastmailCantFind,
"Error: can't find file %s: %s\n"),
! filename,strerror(file_errcode));
#ifdef EX_NOINPUT
exitcode = EX_NOINPUT; /* Better exit code */
#else
Index: elmME+.2.5.al