diff --git a/common/usr/share/MailScanner/perl/MailScanner/Message.pm b/common/usr/share/MailScanner/perl/MailScanner/Message.pm
index c2e9ddb..3699cb2 100644
--- a/common/usr/share/MailScanner/perl/MailScanner/Message.pm
+++ b/common/usr/share/MailScanner/perl/MailScanner/Message.pm
@@ -3027,6 +3027,9 @@ sub UnpackRar {
   # Check version
   return 1 unless $UnrarVersion =~ /^\d+\.\d*$/ && ( $UnrarVersion >= 4.0 && $UnrarVersion < 6.0 );
 
+  # Escape spaces in filename
+  $zipname =~ s/\ /\\\ /g;
+
   # Unrar Version 4x file parse
   if ($UnrarVersion >= 4.0 && $UnrarVersion < 5.0) {
     #MailScanner::Log::WarnLog("UnPackRar Testing : %s", $zipname);