diff --git a/mozilla/mailnews/mime/cthandlers/vcard/nsVCardObj.cpp b/mozilla/mailnews/mime/cthandlers/vcard/nsVCardObj.cpp
index 89b574b2f71..ffcd3f890aa 100644
--- a/mozilla/mailnews/mime/cthandlers/vcard/nsVCardObj.cpp
+++ b/mozilla/mailnews/mime/cthandlers/vcard/nsVCardObj.cpp
@@ -100,8 +100,6 @@ static PRBool needsQuotedPrintable (const char *s)
 	while (*p) {
 		if (*p & 0x80)
 			return PR_TRUE;
-		else
-			return PR_FALSE;
 		p++;
 	}
 
diff --git a/mozilla/mailnews/mime/src/nsMimeURLUtils.cpp b/mozilla/mailnews/mime/src/nsMimeURLUtils.cpp
index f3cecea9746..ca05fd4baca 100644
--- a/mozilla/mailnews/mime/src/nsMimeURLUtils.cpp
+++ b/mozilla/mailnews/mime/src/nsMimeURLUtils.cpp
@@ -565,6 +565,10 @@ nsMimeURLUtils::ScanForURLs(const char *input, PRInt32 input_size,
   if (NS_SUCCEEDED(rv) && prefs)
     prefs->GetBoolPref("mail.do_glyph_substitution", &do_glyph_substitution);
 
+  // We shouldn't do the fun smiley stuff if we are only looking for URL's
+  if (urls_only)
+    do_glyph_substitution = PR_FALSE;
+
   mailToTag = FindAmbitiousMailToTag(input, (PRInt32)input_size);
 
   /* Normal lines are scanned for buried references to URL's