diff --git a/src/smblib/smbtxt.c b/src/smblib/smbtxt.c
index 3e6e0abb983909b361918a9da07350a4bf00d4d2..090ba3b96a498c8e5ac416c1a4f5b54a6d64b012 100644
--- a/src/smblib/smbtxt.c
+++ b/src/smblib/smbtxt.c
@@ -313,6 +313,9 @@ static BOOL mime_getattachment(char* beg, char* end, char* attachment)
 			term = filename + sizeof(fname) - 1;
 		memcpy(fname, filename, term - filename);
 		fname[term - filename] = 0;
+		term = fname;
+		FIND_WHITESPACE(term);
+		*term = 0;
 		strcpy(attachment, getfname(fname));
 		return TRUE;
 	}