diff --git a/zerver/lib/digest.py b/zerver/lib/digest.py
index bcc152debf..629b0977aa 100644
--- a/zerver/lib/digest.py
+++ b/zerver/lib/digest.py
@@ -121,7 +121,7 @@ def gather_new_streams(user_profile, threshold):
         new_streams = list(get_active_streams(user_profile.realm).filter(
                 invite_only=False, date_created__gt=threshold))
 
-    base_url = u"https://%s/#narrow/stream/" % (settings.EXTERNAL_HOST,)
+    base_url = u"%s/#narrow/stream/" % (user_profile.realm.uri,)
 
     streams_html = []
     streams_plain = []
diff --git a/zerver/lib/notifications.py b/zerver/lib/notifications.py
index 1e4bebb46b..0700a7b97f 100644
--- a/zerver/lib/notifications.py
+++ b/zerver/lib/notifications.py
@@ -98,7 +98,7 @@ def build_message_list(user_profile, messages):
         # structure of the URL to leverage.
         content = re.sub(
             r"/user_uploads/(\S*)",
-            settings.EXTERNAL_HOST + r"/user_uploads/\1", content)
+            user_profile.realm.uri + r"/user_uploads/\1", content)
 
         # Our proxying user-uploaded images seems to break inline images in HTML
         # emails, so scrub the image but leave the link.
@@ -108,8 +108,8 @@ def build_message_list(user_profile, messages):
         # URLs for emoji are of the form
         # "static/generated/emoji/images/emoji/snowflake.png".
         content = re.sub(
-            r"static/generated/emoji/images/emoji/",
-            settings.EXTERNAL_HOST + r"/static/generated/emoji/images/emoji/",
+            r"/static/generated/emoji/images/emoji/",
+            user_profile.realm.uri + r"/static/generated/emoji/images/emoji/",
             content)
 
         return content