diff --git a/mozilla/toolkit/locales/en-US/chrome/mozapps/downloads/downloads.dtd b/mozilla/toolkit/locales/en-US/chrome/mozapps/downloads/downloads.dtd
index 518c93c99d4..153831927f8 100644
--- a/mozilla/toolkit/locales/en-US/chrome/mozapps/downloads/downloads.dtd
+++ b/mozilla/toolkit/locales/en-US/chrome/mozapps/downloads/downloads.dtd
@@ -9,6 +9,7 @@
 
 <!-- 'Parental Controls' label should be capitalized -->
 <!ENTITY blocked.label                    "Blocked by Parental Controls">
+<!ENTITY scanning.label                   "Scanning for viruses...">
 
 <!ENTITY downloads.title                  "Downloads">
 
diff --git a/mozilla/toolkit/mozapps/downloads/content/download.xml b/mozilla/toolkit/mozapps/downloads/content/download.xml
index b34ae20e7cd..6e177016de1 100644
--- a/mozilla/toolkit/mozapps/downloads/content/download.xml
+++ b/mozilla/toolkit/mozapps/downloads/content/download.xml
@@ -314,4 +314,31 @@
       </xul:hbox>
     </content>
   </binding>
+
+  <binding id="download-scanning" extends="chrome://mozapps/content/downloads/download.xml#download-base">
+    <content>
+      <xul:hbox flex="1">
+#ifdef SHOW_ICONS
+        <xul:vbox pack="start">
+          <xul:image class="downloadTypeIcon" validate="always"
+                     xbl:inherits="src=image"/>
+        </xul:vbox>
+#endif
+        <xul:vbox pack="start" flex="1">
+          <xul:label xbl:inherits="value=target,tooltiptext=target"
+                       crop="center" flex="2" class="name"/>
+          <xul:hbox>
+            <xul:vbox flex="1">
+              <xul:progressmeter mode="undetermined" flex="1" />
+            </xul:vbox>
+            <xul:button class="info mini-button" tooltiptext="&cmd.info.label;"
+                        command="cmd_showInfo" ondblclick="event.stopPropagation();"
+                        anonid="info"/>
+          </xul:hbox>
+          <xul:label value="&scanning.label;" class="status"/>
+          <xul:spacer flex="1"/>
+        </xul:vbox>
+      </xul:hbox>
+    </content>  
+  </binding>
 </bindings>
diff --git a/mozilla/toolkit/mozapps/downloads/content/downloads.css b/mozilla/toolkit/mozapps/downloads/content/downloads.css
index c2c5d3b5bd6..f70d46dd35e 100644
--- a/mozilla/toolkit/mozapps/downloads/content/downloads.css
+++ b/mozilla/toolkit/mozapps/downloads/content/downloads.css
@@ -27,6 +27,10 @@ richlistitem[type="download"][state="6"] {
   -moz-binding: url('chrome://mozapps/content/downloads/download.xml#download-blocked');
 }
 
+richlistitem[type="download"][state="7"] {
+  -moz-binding: url('chrome://mozapps/content/downloads/download.xml#download-scanning');
+}
+
 /* Only focus buttons in the selected item*/
 richlistitem[type="download"]:not([selected="true"]) button {
   -moz-user-focus: none;
diff --git a/mozilla/toolkit/mozapps/downloads/content/downloads.js b/mozilla/toolkit/mozapps/downloads/content/downloads.js
index c15b333b00b..ef4d688a8c3 100644
--- a/mozilla/toolkit/mozapps/downloads/content/downloads.js
+++ b/mozilla/toolkit/mozapps/downloads/content/downloads.js
@@ -477,7 +477,9 @@ var gContextMenus = [
    "menuitem_copyLocation"],
   // DOWNLOAD_BLOCKED
   ["menuitem_retry", "menuitem_remove", "menuseparator_copy_location",
-   "menuitem_copyLocation"]
+   "menuitem_copyLocation"],
+  // DOWNLOAD_SCANNING
+  ["menuitem_copyLocation"]
 ];
 
 function buildContextMenu(aEvent)