diff --git a/addons/mass_mailing/controllers/main.py b/addons/mass_mailing/controllers/main.py
index 517fa7fa227..5f6a42b11ec 100644
--- a/addons/mass_mailing/controllers/main.py
+++ b/addons/mass_mailing/controllers/main.py
@@ -167,23 +167,13 @@ class MassMailController(http.Controller):
             if not self._valid_unsubscribe_token(mailing_id, res_id, email, str(token)) and not request.env.user.has_group('mass_mailing.group_mass_mailing_user'):
                 raise exceptions.AccessDenied()
 
-            res = mailing.convert_links()
-            base_url = mailing.get_base_url().rstrip('/')
-            urls_to_replace = [
-                (base_url + '/unsubscribe_from_list', mailing._get_unsubscribe_url(email, res_id)),
-                (base_url + '/view', mailing._get_view_url(email, res_id))
-            ]
-            for url_to_replace, new_url in urls_to_replace:
-                if url_to_replace in res[mailing_id]:
-                    res[mailing_id] = res[mailing_id].replace(url_to_replace, new_url if new_url else '#')
-
-            res[mailing_id] = res[mailing_id].replace(
-                'class="o_snippet_view_in_browser"',
-                'class="o_snippet_view_in_browser" style="display: none;"'
-            )
+            html_markupsafe = mailing._render_field('body_html', [res_id])[res_id]
+            # Update generic URLs (without parameters) to final ones
+            html_markupsafe = html_markupsafe.replace('/unsubscribe_from_list',
+                                                      mailing._get_unsubscribe_url(email, res_id))
 
             return request.render('mass_mailing.view', {
-                    'body': res[mailing_id],
+                    'body': html_markupsafe,
                 })
 
         return request.redirect('/web')
diff --git a/addons/mass_mailing/views/mailing_templates_portal_management.xml b/addons/mass_mailing/views/mailing_templates_portal_management.xml
index 03dafe2cd6c..43b141f3a8b 100644
--- a/addons/mass_mailing/views/mailing_templates_portal_management.xml
+++ b/addons/mass_mailing/views/mailing_templates_portal_management.xml
@@ -26,7 +26,22 @@
 
     <!-- Dummy layout to "view" a template content (html) -->
     <template id="view" name="Browser View">
+&lt;!DOCTYPE html&gt;
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+
+        <style type="text/css">
+            <!-- Hide the link view online as it is displayed online -->
+            .o_snippet_view_in_browser {
+                display: none;
+            }
+        </style>
+    </head>
+    <body>
         <!-- Raw body inserted here because it is a rendered mailing, therefore internal content -->
         <t t-out="body"/>
+    </body>
+</html>
     </template>
-</odoo>
\ No newline at end of file
+</odoo>