diff --git a/app/templates/post/_post_full.html b/app/templates/post/_post_full.html
index 97d46850..fcbef7f1 100644
--- a/app/templates/post/_post_full.html
+++ b/app/templates/post/_post_full.html
@@ -13,7 +13,7 @@
             <div class="voting_buttons" aria-live="assertive">
                 {% include "post/_post_voting_buttons.html" -%}
             </div>
-            <h1 class="mt-2 post_title">{{ post.title }}
+            <h1 class="mt-2 post_title"{% if post.language_id and post.language.code != 'en' %} lang="{{ post.language.code }}"{% endif %}>{{ post.title }}
                 {% if current_user.is_authenticated -%}
                     {% include 'post/_post_notification_toggle.html' -%}
                 {% endif -%}
@@ -47,7 +47,7 @@
                     <a href="{{ post.url }}" rel="nofollow ugc" target="_blank" aria-label="Go to image"><img src="{{ post.url }}" style="max-width: 100%; height: auto;"  /></a>
                 {% endif -%}
             </div>
-            <div class="post_body mt-2">
+            <div class="post_body mt-2"{% if post.language_id and post.language.code != 'en' %} lang="{{ post.language.code }}"{% endif %}>
                 {{ post.body_html|community_links|safe if post.body_html else '' }}
             </div>
         </div>
@@ -65,7 +65,7 @@
             <div class="voting_buttons" aria-live="assertive">
                 {% include "post/_post_voting_buttons.html" -%}
             </div>
-            <h1 class="mt-2 post_title">{{ post.title }}
+            <h1 class="mt-2 post_title" {% if post.language_id and post.language.code != 'en' %}lang="{{ post.language.code }}"{% endif %}>{{ post.title }}
                 {% if current_user.is_authenticated -%}
                     {% include 'post/_post_notification_toggle.html' -%}
                 {% endif -%}
diff --git a/app/templates/post/continue_discussion.html b/app/templates/post/continue_discussion.html
index f296d9a1..6d7990b1 100644
--- a/app/templates/post/continue_discussion.html
+++ b/app/templates/post/continue_discussion.html
@@ -13,7 +13,8 @@
         <div class="row post_replies">
             <div class="col">
                 {% macro render_comment(comment) %}
-                    <div id="comment_{{ comment['comment'].id }}" class="comment {% if comment['comment'].author.id == post.author.id %}original_poster{% endif %}" role="treeitem">
+                    <div id="comment_{{ comment['comment'].id }}" class="comment {% if comment['comment'].author.id == post.author.id %}original_poster{% endif %}" role="treeitem"
+                        {% if comment['comment'].language_id and comment['comment'].language.code != 'en' %} lang="{{ comment['comment'].language.code }}"{% endif %}>
                         <div class="limit_height">
                             <div class="comment_author">
                                 {% with collapsed = comment['comment'].score < -10 -%}
diff --git a/app/templates/post/post.html b/app/templates/post/post.html
index c3832b5a..3bb50a61 100644
--- a/app/templates/post/post.html
+++ b/app/templates/post/post.html
@@ -75,6 +75,7 @@
                 </div>
                 {% macro render_comment(comment) -%}
                     <div id="comment_{{ comment['comment'].id }}" class="comment {% if comment['comment'].score <= -10 -%}low_score{% endif -%}
+                        {% if comment['comment'].language_id and comment['comment'].language.code != 'en' %} lang="{{ comment['comment'].language.code }}"{% endif %}
                         {% if comment['comment'].author.id == post.author.id -%}original_poster{% endif -%}" aria-level="{{ comment['comment'].depth + 1 }}" role="treeitem" aria-expanded="true" tabindex="0">
                         <div class="limit_height">{% if not comment['comment'].author.indexable -%}<!--googleoff: all-->{% endif -%}
                             <div class="comment_author">