diff --git a/contact/pubspec.lock b/contact/pubspec.lock
index e92a2e3b7e..8c1611a664 100644
--- a/contact/pubspec.lock
+++ b/contact/pubspec.lock
@@ -996,9 +996,9 @@ packages:
     dependency: transitive
     description:
       path: sanitize_html
-      ref: twake-supported
-      resolved-ref: "5b9986c42cc86c7e565c941648f875f2e1d2f7bd"
-      url: "https://github.com/dab246/dart-neats.git"
+      ref: support_mail
+      resolved-ref: c663ad93a659fce3c0d209a048fa93c6465ebedc
+      url: "https://github.com/linagora/dart-neats.git"
     source: git
     version: "2.1.0"
   shelf:
diff --git a/core/pubspec.lock b/core/pubspec.lock
index 287165a1e3..4645538c8c 100644
--- a/core/pubspec.lock
+++ b/core/pubspec.lock
@@ -949,9 +949,9 @@ packages:
     dependency: "direct main"
     description:
       path: sanitize_html
-      ref: twake-supported
-      resolved-ref: "5b9986c42cc86c7e565c941648f875f2e1d2f7bd"
-      url: "https://github.com/dab246/dart-neats.git"
+      ref: support_mail
+      resolved-ref: c663ad93a659fce3c0d209a048fa93c6465ebedc
+      url: "https://github.com/linagora/dart-neats.git"
     source: git
     version: "2.1.0"
   shelf:
diff --git a/core/pubspec.yaml b/core/pubspec.yaml
index 96529670d2..2a37478ca8 100644
--- a/core/pubspec.yaml
+++ b/core/pubspec.yaml
@@ -34,10 +34,13 @@ dependencies:
       url: https://github.com/dab246/languagetool_textfield.git
       ref: twake-supported
 
+  # Sanitize_html is restricting Tags and Attributes. So some of our own tags and attributes (signature, public asset,...) will be lost when sanitizing html.
+  # TODO: We will change it when the PR in upstream repository will be merged
+  # https://github.com/google/dart-neats/pull/259
   sanitize_html:
     git:
-      url: https://github.com/dab246/dart-neats.git
-      ref: twake-supported
+      url: https://github.com/linagora/dart-neats.git
+      ref: support_mail
       path: sanitize_html
 
   ### Dependencies from pub.dev ###
diff --git a/model/pubspec.lock b/model/pubspec.lock
index 8ad08f59a3..7973afbcee 100644
--- a/model/pubspec.lock
+++ b/model/pubspec.lock
@@ -973,9 +973,9 @@ packages:
     dependency: transitive
     description:
       path: sanitize_html
-      ref: twake-supported
-      resolved-ref: "5b9986c42cc86c7e565c941648f875f2e1d2f7bd"
-      url: "https://github.com/dab246/dart-neats.git"
+      ref: support_mail
+      resolved-ref: c663ad93a659fce3c0d209a048fa93c6465ebedc
+      url: "https://github.com/linagora/dart-neats.git"
     source: git
     version: "2.1.0"
   shelf:
diff --git a/pubspec.lock b/pubspec.lock
index dff98beaf4..1482ff866f 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -1718,9 +1718,9 @@ packages:
     dependency: transitive
     description:
       path: sanitize_html
-      ref: twake-supported
-      resolved-ref: "5b9986c42cc86c7e565c941648f875f2e1d2f7bd"
-      url: "https://github.com/dab246/dart-neats.git"
+      ref: support_mail
+      resolved-ref: c663ad93a659fce3c0d209a048fa93c6465ebedc
+      url: "https://github.com/linagora/dart-neats.git"
     source: git
     version: "2.1.0"
   server_settings: