diff --git a/4chan_x.user.js b/4chan_x.user.js
index eceb937a6..e68bc5037 100644
--- a/4chan_x.user.js
+++ b/4chan_x.user.js
@@ -3714,7 +3714,7 @@
         capcode: data.capcode,
         tripcode: data.trip,
         uniqueID: data.id,
-        email: data.email.replace(/\s/g, '%20'),
+        email: data.email ? encodeURIComponent(data.email) : '',
         subject: data.sub,
         flagCode: data.country,
         flagName: data.country_name,
@@ -3783,7 +3783,7 @@
           capcodeStart = '';
           capcode = '';
       }
-      flag = flagCode ? (" <img src='" + staticPath + "/image/country/" + (g.BOARD === 'pol' ? 'troll/' : '')) + flagCode.toLowerCase() + (".gif' alt=" + flagCode + " title='" + flagName + "' class=countryFlag>") : '';
+      flag = flagCode ? (" <img src='" + staticPath + "/image/country/" + (board === 'pol' ? 'troll/' : '')) + flagCode.toLowerCase() + (".gif' alt=" + flagCode + " title='" + flagName + "' class=countryFlag>") : '';
       if (file != null ? file.isDeleted : void 0) {
         fileHTML = isOP ? ("<div class=file id=f" + postID + "><div class=fileInfo></div><span class=fileThumb>") + ("<img src='" + staticPath + "/image/filedeleted.gif' alt='File deleted.'>") + "</span></div>" : ("<div id=f" + postID + " class=file><span class=fileThumb>") + ("<img src='" + staticPath + "/image/filedeleted-res.gif' alt='File deleted.'>") + "</span></div>";
       } else if (file) {
diff --git a/script.coffee b/script.coffee
index 4d9c4821e..334cfbc75 100644
--- a/script.coffee
+++ b/script.coffee
@@ -2920,7 +2920,7 @@ Build =
       capcode:  data.capcode
       tripcode: data.trip
       uniqueID: data.id
-      email:    data.email.replace /\s/g, '%20' # UGH
+      email:    if data.email then encodeURIComponent data.email else ''
       subject:  data.sub
       flagCode: data.country
       flagName: data.country_name
@@ -3011,7 +3011,7 @@ Build =
 
     flag =
       if flagCode
-       " <img src='#{staticPath}/image/country/#{if g.BOARD is 'pol' then 'troll/' else ''}" +
+       " <img src='#{staticPath}/image/country/#{if board is 'pol' then 'troll/' else ''}" +
         flagCode.toLowerCase() + ".gif' alt=#{flagCode} title='#{flagName}' class=countryFlag>"
       else
         ''