Bug 357321 don't blindly trust address book recipients when loading remote content - Fix msgHdrForCurrentMessage patch

r=mscott

mail/base/content/mailWindowOverlay.js

@@ -2303,8 +2303,7 @@ function loadMsgWithRemoteContent()
 function msgHdrForCurrentMessage()
 {
   var msgURI = GetLoadedMessage();
-  if (msgURI && !(/type=application\/x-message-display/.test(msgURI)))
-    return (msgURI && !(/type=application\/x-message-display/.test(msgURI))) ? messenger.msgHdrFromURI(msgURI) : null;
+  return (msgURI && !(/type=application\/x-message-display/.test(msgURI))) ? messenger.msgHdrFromURI(msgURI) : null;
 }
 
 /**