diff --git a/src/client/main.cc b/src/client/main.cc
index 10ceff3..654e546 100644
--- a/src/client/main.cc
+++ b/src/client/main.cc
@@ -122,10 +122,9 @@ int main() {
         // Create a new message object
         Message message;
 
-        // FIXME Seems to send multiple messages if content contains spaces
         // Get the content of the message from the user
         cout << "Type message to server: ";
-        cin >> message.content;
+        std::getline(cin, message.content);
 
         // Exit the program if the user typed "exit" as the content of the
         // message