diff --git a/exec/newslink.js b/exec/newslink.js
index 7dbe01bb753512b3cd97f242693675c0cdef5856..a6a214c676426afd70fc998a9e696d863afa8da3 100644
--- a/exec/newslink.js
+++ b/exec/newslink.js
@@ -493,7 +493,7 @@ for(i in area) {
 					line=line.slice(1);		// Skip prepended dots
 
                 if(flags.indexOf('b')>=0) {        // decode attachments   
-                    if(line.substr(0,6)=="begin ") {   
+                    if(file==undefined && line.substr(0,6)=="begin ") {   
 						 // Parse uuencode header   
 						 arg=line.split(/\s+/);   
 						 arg.splice(0,2);        // strip "begin 666 "   
@@ -568,7 +568,7 @@ for(i in area) {
             }
 			/* Append MD5 to history file */
 			if(md5_file.open("a")) {
-				md5_file.printf("%s %s\n",md5,file.name);
+				md5_file.printf("%s %s\n",md5,file_getname(file.name));
 				md5_file.close();
 			} else
 				printf("!ERROR %d (%s) creating/appending %s\r\n"