diff --git a/src/lib.rs b/src/lib.rs
index 8c92ddc..dcf1329 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -37,6 +37,9 @@ use mammut::{
 // reqwest
 use reqwest::blocking::Client;
 
+// htmlescape
+use htmlescape::decode_html;
+
 /**********
  * Generic usage functions
 ***********/
@@ -144,9 +147,9 @@ fn build_basic_status(tweet: &Tweet) -> Result<StatusBuilder, Box<dyn Error>> {
         toot = toot.replace(&decoded_url.0, &decoded_url.1);
     }
 
-    // remove the &amp; and replace it with &
-    // this is the only entities and/or char that is not available via Twitter API
-    toot = toot.replace("&amp;", "&");
+    if let Ok(t) = decode_html(&toot) {
+        toot = t;
+    }
 
     Ok(StatusBuilder::new(toot))
 }