diff --git a/odoo/addons/base/views/res_users_views.xml b/odoo/addons/base/views/res_users_views.xml
index 9e0ce79346e..dadb69b60f6 100644
--- a/odoo/addons/base/views/res_users_views.xml
+++ b/odoo/addons/base/views/res_users_views.xml
@@ -255,7 +255,7 @@
                                     </group>
                                 </group>
                                 <group name="messaging">
-                                    <field name="signature"/>
+                                    <field name="signature" options="{'style-inline': true}"/>
                                 </group>
                             </page>
                         </notebook>
@@ -453,7 +453,7 @@
                                 </group>
                             </group>
                             <group name="signature">
-                                <field name="signature" readonly="0"/>
+                                <field name="signature" readonly="0" options="{'style-inline': true}"/>
                             </group>
                             <group name="status" string="Status" invisible="1">
                                 <field name="company_id" options="{'no_create': True}" readonly="0"
diff --git a/odoo/tools/mail.py b/odoo/tools/mail.py
index e13a6bb47a1..b08fd15f621 100644
--- a/odoo/tools/mail.py
+++ b/odoo/tools/mail.py
@@ -39,6 +39,7 @@ safe_attrs = clean.defs.safe_attrs | frozenset(
      'data-o-mail-quote',  # quote detection
      'data-oe-model', 'data-oe-id', 'data-oe-field', 'data-oe-type', 'data-oe-expression', 'data-oe-translation-id', 'data-oe-nodeid',
      'data-publish', 'data-id', 'data-res_id', 'data-interval', 'data-member_id', 'data-scroll-background-ratio', 'data-view-id',
+     'data-class',
      ])