diff --git a/ui/src/components/mail/view.rs b/ui/src/components/mail/view.rs
index 39cf9086..1072feb4 100644
--- a/ui/src/components/mail/view.rs
+++ b/ui/src/components/mail/view.rs
@@ -240,7 +240,7 @@ impl MailView {
         let mut buf = CellBuffer::from(s);
 
         if highlight_urls {
-            let lines: Vec<&str> = s.split('\n').map(|l| l.trim_right()).collect();
+            let lines: Vec<&str> = s.split('\n').map(|l| l.trim_end()).collect();
             let mut shift = 0;
             let mut lidx_total = 0;
             let finder = LinkFinder::new();
diff --git a/ui/src/components/mail/view/envelope.rs b/ui/src/components/mail/view/envelope.rs
index 9893ca4a..040c2f10 100644
--- a/ui/src/components/mail/view/envelope.rs
+++ b/ui/src/components/mail/view/envelope.rs
@@ -192,7 +192,7 @@ impl EnvelopeView {
         let mut buf = CellBuffer::from(s);
 
         if highlight_urls {
-            let lines: Vec<&str> = s.split('\n').map(|l| l.trim_right()).collect();
+            let lines: Vec<&str> = s.split('\n').map(|l| l.trim_end()).collect();
             let mut shift = 0;
             let mut lidx_total = 0;
             let finder = LinkFinder::new();
diff --git a/ui/src/terminal/cells.rs b/ui/src/terminal/cells.rs
index 10ac403e..97a4b5b4 100644
--- a/ui/src/terminal/cells.rs
+++ b/ui/src/terminal/cells.rs
@@ -242,7 +242,7 @@ impl Default for CellBuffer {
 
 impl<'a> From<&'a str> for CellBuffer {
     fn from(s: &'a str) -> Self {
-        let lines: Vec<&str> = s.lines().map(|l| l.trim_right()).collect();
+        let lines: Vec<&str> = s.lines().map(|l| l.trim_end()).collect();
         let len = s.len() + lines.len();
         let mut buf = CellBuffer::new(len, 1, Cell::default());
         let mut x = 0;