diff --git a/templates/cards/note/view.html.twig b/templates/cards/note/view.html.twig
index df6a68d822..2180c24335 100644
--- a/templates/cards/note/view.html.twig
+++ b/templates/cards/note/view.html.twig
@@ -139,10 +139,6 @@
                     {{ block | raw }}
                 </aside>
             {% endfor %}
-
-{#            {% if note_language is defined and note_language is not empty %}#}
-{#                <div title="{{ 'Note\'s language' | trans }}" class="h-entry-language">{{ note_language }}</div>#}
-{#            {% endif %}#}
         </div>
     </article>
 {% endmacro macro_note %}
@@ -155,16 +151,13 @@
     {% set actor_url = actor.getUrl() %}
     {% set mention = mention(actor) %}
 
-    <article class="h-entry hentry note">
+    <article class="h-entry hentry note" lang={{ note.getLanguageLocale() }}>
         {{ block('note_sidebar') }}
         <div class="note-wrapper">
-            <div tabindex="0" title="{{ 'Begin a note by the user: ' | trans }} {{ nickname }}." class="note-info">
-                {{ block('note_author') }}
-            </div>
-            <section tabindex="0" role="dialog" class="e-content entry-content note-content">
+            {{ block('note_info') }}
+
+            <section role="dialog" class="e-content entry-content note-content">
                 {{ block('note_text') }}
-                {{ block('note_attachments') }}
-                {{ block('note_links') }}
             </section>
         </div>
     </article>