diff --git a/src/dc_tools.rs b/src/dc_tools.rs
index 4d8d110d7..a40407b05 100644
--- a/src/dc_tools.rs
+++ b/src/dc_tools.rs
@@ -12,6 +12,8 @@ use crate::dc_log::*;
 use crate::types::*;
 use crate::x::*;
 
+const ELLIPSE: &'static str = "[...]";
+
 /* Some tools and enhancements to the used libraries, there should be
 no references to Context and other "larger" classes here. */
 // for carray etc.
@@ -345,9 +347,12 @@ pub unsafe fn dc_utf8_strlen(s: *const libc::c_char) -> size_t {
 }
 
 pub fn dc_truncate_str(buf: &str, approx_chars: usize) -> Cow<str> {
-    let appendix = "[...]";
-    if approx_chars > 0 && buf.len() > approx_chars + appendix.len() {
-        Cow::Owned(format!("{}{}", &buf[..approx_chars], appendix))
+    if approx_chars > 0 && buf.len() > approx_chars + ELLIPSE.len() {
+        if let Some(index) = buf[..approx_chars].rfind(|c| c == ' ' || c == '\n') {
+            Cow::Owned(format!("{}{}", &buf[..index + 1], ELLIPSE))
+        } else {
+            Cow::Owned(format!("{}{}", &buf[..approx_chars], ELLIPSE))
+        }
     } else {
         Cow::Borrowed(buf)
     }
@@ -1710,10 +1715,11 @@ mod tests {
         assert_eq!(dc_truncate_str("1234", 2), "1234");
     }
 
-    #[test]
-    fn test_dc_str_truncate_3() {
-        assert_eq!(dc_truncate_str("1234567", 3), "1[...]");
-    }
+    // This test seems wrong
+    // #[test]
+    // fn test_dc_str_truncate_3() {
+    //     assert_eq!(dc_truncate_str("1234567", 3), "1[...]");
+    // }
 
     #[test]
     fn test_dc_str_truncate_4() {