diff --git a/tildes/tildes/templates/macros/messages.jinja2 b/tildes/tildes/templates/macros/messages.jinja2
index f7e8e84..5f95bfa 100644
--- a/tildes/tildes/templates/macros/messages.jinja2
+++ b/tildes/tildes/templates/macros/messages.jinja2
@@ -13,6 +13,10 @@
       {{ time_ago(message.created_time) }}
     </header>
 
-    <div class="message-text">{{ message.rendered_html|safe }}</div>
+    <div class="message-text"
+      {% if request.user and request.user.open_new_tab_text %}
+      data-js-external-links-new-tabs
+      {% endif %}
+    >{{ message.rendered_html|safe }}</div>
   </article>
 {% endmacro %}
diff --git a/tildes/tildes/templates/macros/topics.jinja2 b/tildes/tildes/templates/macros/topics.jinja2
index daa1c06..eb9a5b8 100644
--- a/tildes/tildes/templates/macros/topics.jinja2
+++ b/tildes/tildes/templates/macros/topics.jinja2
@@ -51,7 +51,11 @@
       {% if not topic.get_content_metadata('excerpt').endswith('...') %}
         <p class="topic-text-excerpt">{{ topic.get_content_metadata('excerpt') }}</p>
       {% else %}
-        <details class="topic-text-excerpt">
+        <details class="topic-text-excerpt"
+          {% if request.user and request.user.open_new_tab_text %}
+          data-js-external-links-new-tabs
+          {% endif %}
+        >
           <summary>
             <span>{{ topic.get_content_metadata('excerpt') }}</span>
           </summary>
diff --git a/tildes/tildes/templates/topic.jinja2 b/tildes/tildes/templates/topic.jinja2
index 508f15e..78e60a8 100644
--- a/tildes/tildes/templates/topic.jinja2
+++ b/tildes/tildes/templates/topic.jinja2
@@ -40,7 +40,11 @@
 
 {% if request.has_permission('view_content', topic) %}
   {% if topic.is_text_type %}
-    <div class="topic-full-text">{{ topic.rendered_html|safe }}</div>
+    <div class="topic-full-text"
+      {% if request.user and request.user.open_new_tab_text %}
+      data-js-external-links-new-tabs
+      {% endif %}
+    >{{ topic.rendered_html|safe }}</div>
   {% elif topic.is_link_type %}
     <div class="topic-full-link">
       <div class="topic-icon topic-icon-{{ topic.link_domain.replace('.', '_') }}"></div>