diff --git a/mozilla/mailnews/base/resources/content/msgHdrViewOverlay.js b/mozilla/mailnews/base/resources/content/msgHdrViewOverlay.js
index d9027bc42c8..5249bf69595 100644
--- a/mozilla/mailnews/base/resources/content/msgHdrViewOverlay.js
+++ b/mozilla/mailnews/base/resources/content/msgHdrViewOverlay.js
@@ -759,20 +759,40 @@ function createNewAttachmentInfo(contentType, url, displayName, uri, notDownload
   this.notDownloaded = notDownloaded;
 }
 
-function saveAttachment(contentType, url, displayName, messageUri)
+function dofunc(aFunctionName, aFunctionArg)
 {
-  messenger.saveAttachment(contentType, url, displayName, messageUri);
+  if (aFunctionName == "saveAttachment") 
+    saveAttachment(aFunctionArg); 
+  else if (aFunctionName == "openAttachment") 
+    openAttachment(aFunctionArg); 
+  else if (aFunctionName == "printAttachment") 
+    printAttachment(aFunctionArg);
 }
 
-function openAttachment(contentType, url, displayName, messageUri)
+function saveAttachment(aAttachment)
 {
-  messenger.openAttachment(contentType, url, displayName, messageUri);
+  messenger.saveAttachment(aAttachment.contentType, 
+                           aAttachment.url, 
+                           aAttachment.displayName, 
+                           aAttachment.messageUri);
 }
 
-function printAttachmentAttachment(contentType, url, displayName, messageUri)
+function openAttachment(aAttachment)
 {
-  // we haven't implemented the ability to print attachments yet...
-  // messenger.printAttachment(contentType, url, displayName, messageUri);
+  messenger.openAttachment(aAttachment.contentType, 
+                           aAttachment.url, 
+                           aAttachment.displayName, 
+                           aAttachment.messageUri);
+}
+
+function printAttachment(aAttachment)
+{
+  /* we haven't implemented the ability to print attachments yet...
+  messenger.printAttachment(aAttachment.contentType, 
+                            aAttachment.url, 
+                            aAttachment.displayName, 
+                            aAttachment.messageUri);
+  */
 }
 
 function onShowAttachmentContextMenu()
@@ -806,32 +826,31 @@ function attachmentListClick(event)
       var target = event.target;
       if (target.localName == "listitem")
       {
-	    var commandStringSuffix = target.getAttribute("commandSuffix");
-        var openString = 'openAttachment' + commandStringSuffix;
-        eval(openString);
+	dofunc("openAttachment", target.attachment);
       }
     }
 }
 
 // on command handlers for the attachment list context menu...
-// commandPrefix matches one of our existing functions (openAttachment, saveAttachment, etc.) which we'll add to the command suffix
-// found on the listitem....
+// commandPrefix matches one of our existing functions 
+// (openAttachment, saveAttachment, etc.)
 function handleAttachmentSelection(commandPrefix)
 {
-  // get the selected attachment...and call openAttachment on it...
   var attachmentList = document.getElementById('attachmentList');
   var selectedAttachments = attachmentList.selectedItems;
   var listItem = selectedAttachments[0];
-  var commandStringSuffix = listItem.getAttribute("commandSuffix");
-  var openString = commandPrefix + commandStringSuffix;
-  eval(openString);
+
+  dofunc(commandPrefix, listItem.attachment);
 }
 
-function generateCommandSuffixForAttachment(attachment)
+function cloneAttachment(aAttachment)
 {
-  // replace ' in url with \' so we can eval() correctly
-  var attachmentUrl = attachment.url.replace(/'/g,"\\\'");
-  return "('" + attachment.contentType + "', '" + attachmentUrl + "', '" + escape(attachment.displayName) + "', '" + attachment.uri + "')";
+  var obj = new Object();
+  obj.contentType = aAttachment.contentType;
+  obj.url = aAttachment.url;
+  obj.displayName = aAttachment.displayName;
+  obj.messageUri = aAttachment.uri;
+  return obj;
 }
 
 function displayAttachmentsForExpandedView()
@@ -842,16 +861,17 @@ function displayAttachmentsForExpandedView()
     var attachmentList = document.getElementById('attachmentList');
     for (index in currentAttachments)
     {
-      var attachment = currentAttachments[index];
+      var attachment = currentAttachments[index];
+
       // we need to create a listitem to insert the attachment
       // into the attachment list..
-
-	    var item = document.createElement("listitem");
-
+	  var item = document.createElement("listitem");
       item.setAttribute("class", "listitem-iconic"); 
       item.setAttribute("label", attachment.displayName);
-      item.setAttribute("tooltip", "attachmentListTooltip");
-      item.setAttribute("commandSuffix", generateCommandSuffixForAttachment(attachment)); // set the command suffix on the listitem...
+      item.setAttribute("tooltip", "attachmentListTooltip");
+
+	  item.attachment = cloneAttachment(attachment);
+
       setApplicationIconForAttachment(attachment, item);
   	  attachmentList.appendChild(item);
     } // for each attachment
@@ -949,13 +969,13 @@ function addAttachmentToPopup(popup, attachment, attachmentIndex)
       item.setAttribute('label', formattedDisplayNameString); 
       item.setAttribute('accesskey', attachmentIndex); 
 
-      var oncommandPrefix = generateCommandSuffixForAttachment(attachment);
-
       var openpopup = document.createElement('menupopup');
       openpopup = item.appendChild(openpopup);
 
       var menuitementry = document.createElement('menuitem');     
-      menuitementry.setAttribute('oncommand', 'openAttachment' + oncommandPrefix); 
+
+      menuitementry.attachment = cloneAttachment(attachment);
+      menuitementry.setAttribute('oncommand', 'openAttachment(this.attachment)'); 
 
       if (!gSaveLabel)
         gSaveLabel = gMessengerBundle.getString("saveLabel");
@@ -974,7 +994,8 @@ function addAttachmentToPopup(popup, attachment, attachmentIndex)
       openpopup.appendChild(menuseparator);
       
       menuitementry = document.createElement('menuitem');
-      menuitementry.setAttribute('oncommand', 'saveAttachment' + oncommandPrefix); 
+      menuitementry.attachment = cloneAttachment(attachment);
+      menuitementry.setAttribute('oncommand', 'saveAttachment(this.attachment)'); 
       menuitementry.setAttribute('label', gSaveLabel); 
       menuitementry.setAttribute('accesskey', gSaveLabelAccesskey); 
       menuitementry = openpopup.appendChild(menuitementry);