diff --git a/src/client.rs b/src/client.rs
index e8f03a7..1e59603 100644
--- a/src/client.rs
+++ b/src/client.rs
@@ -187,6 +187,7 @@ impl ChatLog {
     }
 }
 
+#[allow(unused_macros)]
 macro_rules! chat_msg {
     ($chat:expr, $($arg:tt)*) => {
         $chat.push(format!($($arg)*), Color::White)
@@ -305,6 +306,12 @@ impl Prompt {
         }
     }
 
+    fn delete(&mut self) {
+        if self.cursor < self.buffer.len() {
+            self.buffer.remove(self.cursor);
+        }
+    }
+
     fn before_cursor(&self) -> &[char] {
         &self.buffer[..self.cursor]
     }
@@ -323,6 +330,12 @@ impl Prompt {
             self.buffer.pop();
         }
     }
+
+    fn delete_word(&mut self) {
+        while self.at_cursor().is_alphabetic() {
+            self.buffer.remove(self.cursor);
+        }
+    }
 }
 
 #[derive(Default)]
@@ -480,6 +493,7 @@ fn main() -> io::Result<()> {
                             match x {
                                 'c' => client.quit = true,
                                 'k' => prompt.delete_until_end(),
+                                'w' => prompt.delete_word(),
                                 _ => {}
                             }
                         } else {
@@ -498,8 +512,7 @@ fn main() -> io::Result<()> {
                             prompt.right_char();
                         }
                         KeyCode::Backspace => prompt.backspace(),
-                        // TODO: delete current character by KeyCode::Delete
-                        // TODO: delete word by Ctrl+W
+                        KeyCode::Delete => prompt.delete(),
                         KeyCode::Tab => {
                             if let Some((prefix, &[])) = parse_command(prompt.before_cursor()) {
                                 let prefix = prefix.iter().collect::<String>();
@@ -528,10 +541,6 @@ fn main() -> io::Result<()> {
                                 if let Some(ref mut stream) = &mut client.stream {
                                     let prompt = prompt.buffer.iter().collect::<String>();
                                     stream.write(prompt.as_bytes())?;
-                                    // TODO: don't display the message if it was not delivered
-                                    // Maybe the server should actually send your own message back.
-                                    // Not sending it back made sense in the telnet times.
-                                    chat_msg!(&mut client.chat, "{text}", text = &prompt);
                                 } else {
                                     chat_info!(&mut client.chat, "You are offline. Use {signature} to connect to a server.", signature = find_command("connect").expect("connect command").signature);
                                 }
@@ -550,7 +559,12 @@ fn main() -> io::Result<()> {
                 Ok(n) => {
                     if n > 0 {
                         if let Some(line) = sanitize_terminal_output(&buf[..n]) {
-                            client.chat.push(line, Color::White)
+                            // TODO: some user can just send message, that starts with 'You: ', and it will be highlighted as your
+                            if line.starts_with("You: ") {
+                                client.chat.push(line, Color::Magenta)
+                            } else {
+                                client.chat.push(line, Color::White);
+                            }
                         }
                     } else {
                         client.stream = None;
diff --git a/src/server.rs b/src/server.rs
index f187b81..5002203 100644
--- a/src/server.rs
+++ b/src/server.rs
@@ -170,11 +170,16 @@ impl Server {
             if author.authed {
                 println!("INFO: Client {author_addr} sent message {bytes:?}", author_addr = Sens(author_addr));
                 for (client_token, client) in self.clients.iter_mut() {
-                    if *client_token != token && client.authed {
-                        let _ = writeln!(client.conn, "{text}").map_err(|err| {
-                            eprintln!("ERROR: could not broadcast message to all the clients from {author_addr}: {err}", author_addr = Sens(author_addr), err = Sens(err))
-                        });
-                    }
+                    let message = if *client_token != token && client.authed {
+                        format!("{text}")
+                    } else {
+                        format!("You: {text}")
+                    };
+
+                    let _ = writeln!(client.conn, "{message}").map_err(|err| {
+                        eprintln!("ERROR: could not broadcast message to all the clients from {author_addr}: {err}", 
+                            author_addr = Sens(author_addr), err = Sens(err))
+                    });
                 }
             } else {
                 if text != self.token {