merge
diff --git a/mail/lib/validateattachment b/mail/lib/validateattachment
index d21044f..74018d0 100755
--- a/mail/lib/validateattachment
+++ b/mail/lib/validateattachment
@@ -54,6 +54,10 @@
 	# but the errors look like
 	# unzip: reading data for philw.doc.scr failed: ...
 	# so we can still catch these.
+	if(! unzip -tsf $file >[2=1] >/dev/null){
+		echo corrupt zip file!
+		exit $discard
+	}
 	if(unzip -tsf $file >[2=1] | grep -si '      |\.(scr|exe|pif|bat|com)$'){
 		echo executables inside zip file!
 		exit $discard