diff --git a/src/client/composer/contact-entry-completion.vala b/src/client/composer/contact-entry-completion.vala
index faced544..36857117 100644
--- a/src/client/composer/contact-entry-completion.vala
+++ b/src/client/composer/contact-entry-completion.vala
@@ -130,6 +130,9 @@ public class ContactEntryCompletion : Gtk.EntryCompletion {
             }
             bytes_seen_so_far += token_bytes;
         }
+        for (int i = 0; i < addresses.size; i++) {
+            addresses[i] = addresses[i].strip();
+        }
         
         return addresses;
     }