diff --git a/mozilla/mailnews/compose/src/nsMsgCompose.h b/mozilla/mailnews/compose/src/nsMsgCompose.h
index 95c008abe6e..69f3526c94b 100644
--- a/mozilla/mailnews/compose/src/nsMsgCompose.h
+++ b/mozilla/mailnews/compose/src/nsMsgCompose.h
@@ -238,4 +238,4 @@ public:
 };
 
 
-#endif /* _nsMsgCompose_H_ */
\ No newline at end of file
+#endif /* _nsMsgCompose_H_ */
diff --git a/mozilla/mailnews/local/src/nsPop3Protocol.cpp b/mozilla/mailnews/local/src/nsPop3Protocol.cpp
index fb687b6f5fe..b920847c43c 100644
--- a/mozilla/mailnews/local/src/nsPop3Protocol.cpp
+++ b/mozilla/mailnews/local/src/nsPop3Protocol.cpp
@@ -1952,7 +1952,7 @@ nsPop3Protocol::RetrResponse(nsIInputStream* inputStream,
 	buffer_size = status;  // status holds # bytes we've actually buffered so far...
   
     /* normal read. Yay! */
-    if (m_pop3ConData->bytes_received_in_message + buffer_size >
+    if ((PRInt32) (m_pop3ConData->bytes_received_in_message + buffer_size) >
         m_pop3ConData->cur_msg_size) 
         buffer_size = m_pop3ConData->cur_msg_size -
             m_pop3ConData->bytes_received_in_message; 
diff --git a/mozilla/mailnews/mime/src/mimedrft.cpp b/mozilla/mailnews/mime/src/mimedrft.cpp
index ba83d00fcd1..8297d78cb89 100644
--- a/mozilla/mailnews/mime/src/mimedrft.cpp
+++ b/mozilla/mailnews/mime/src/mimedrft.cpp
@@ -1503,7 +1503,8 @@ mime_decompose_file_init_fn ( void *stream_closure, MimeHeaders *headers )
   struct mime_draft_data *mdd = (struct mime_draft_data *) stream_closure;
   nsMsgAttachedFile *attachments = 0, *newAttachment = 0;
   int nAttachments = 0;
-  char *hdr_value = NULL, *parm_value = NULL;
+  //char *hdr_value = NULL;
+  char *parm_value = NULL;
   PRBool needURL = PR_FALSE;
   PRBool creatingMsgBody = PR_TRUE;
   PRBool bodyPart = PR_FALSE;