diff --git a/Gemfile b/Gemfile
index 45e194e13..72330acbf 100644
--- a/Gemfile
+++ b/Gemfile
@@ -138,9 +138,7 @@ gem 'procore-sift'
 # parse email
 gem 'email_reply_trimmer'
 
-# TODO: we might have to fork this gem since 0.3.1 has hard depency on nokogir 1.10.
-# and this gem hasn't been updated for a while.
-gem 'html2text', git: 'https://github.com/chatwoot/html2text_ruby', branch: 'chatwoot'
+gem 'html2text'
 
 # to calculate working hours
 gem 'working_hours'
diff --git a/Gemfile.lock b/Gemfile.lock
index be31e028a..ff0197a90 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -22,14 +22,6 @@ GIT
       devise (>= 4.0.0, < 5.0.0)
       railties (>= 5.0.0, < 8.0.0)
 
-GIT
-  remote: https://github.com/chatwoot/html2text_ruby
-  revision: cdbdbbbf898d846d0136d69d688a003c6b26074b
-  branch: chatwoot
-  specs:
-    html2text (0.3.1)
-      nokogiri (>= 1.13.6)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -361,6 +353,8 @@ GEM
     hana (1.3.7)
     hashdiff (1.1.0)
     hashie (5.0.0)
+    html2text (0.4.0)
+      nokogiri (>= 1.0, < 2.0)
     http (5.1.1)
       addressable (~> 2.8)
       http-cookie (~> 1.0)
@@ -503,14 +497,14 @@ GEM
     newrelic_rpm (9.6.0)
       base64
     nio4r (2.7.3)
-    nokogiri (1.17.1)
+    nokogiri (1.18.2)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.17.1-arm64-darwin)
+    nokogiri (1.18.2-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.17.1-x86_64-darwin)
+    nokogiri (1.18.2-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.17.1-x86_64-linux)
+    nokogiri (1.18.2-x86_64-linux-gnu)
       racc (~> 1.4)
     oauth (1.1.0)
       oauth-tty (~> 1.0, >= 1.0.1)
@@ -897,7 +891,7 @@ DEPENDENCIES
   haikunator
   hairtrigger
   hashie
-  html2text!
+  html2text
   image_processing
   jbuilder
   json_refs