diff --git a/Cargo.toml b/Cargo.toml
index 801d188..185c0fb 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,11 +14,9 @@ html-escape = "0.2.13"
 hsluv = "0.3.1"
 sha1 = "0.10.6"
 tokio = { version = "1", features = [ "rt" ] }
-xmpp = { git = "https://gitlab.com/xmpp-rs/xmpp-rs" }
-tokio-xmpp = { git = "https://gitlab.com/xmpp-rs/xmpp-rs", features = ["syntax-highlighting"] }
+xmpp = { git = "https://gitlab.com/xmpp-rs/xmpp-rs", features = [ "syntax-highlighting", "serde" ] }
 async-channel = "2.3.1"
 env_logger = { version = "0.11.3", default-features = false, features = ["color", "auto-color", "humantime"] }
 camino = "1.1"
 serde = { version = "1.0", features = [ "derive" ] }
 toml = "0.8"
-jid = { git = "https://gitlab.com/xmpp-rs/xmpp-rs", features = [ "serde" ] }
diff --git a/src/main.rs b/src/main.rs
index 872404e..fef4ef1 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -70,7 +70,7 @@ fn on_login_pressed(
                         config
                             .write()
                             .unwrap()
-                            .save_account(&jid::BareJid::new(jid.as_str()).unwrap(), &password);
+                            .save_account(&xmpp::BareJid::new(jid.as_str()).unwrap(), &password);
                         win.stack().set_visible_child(win.split_view());
                     }
                     xmpp_client::XMPPEvent::Avatar(jid, avatar) => {
@@ -224,7 +224,7 @@ fn main() {
                 let item = tabs_selection.selected_item().unwrap();
                 let tab: &Tab = item.downcast_ref().unwrap();
                 println!("Switching to {}", tab.jid());
-                let store = messages2.with_jid(&jid::BareJid::new(&tab.jid()).unwrap());
+                let store = messages2.with_jid(&xmpp::BareJid::new(&tab.jid()).unwrap());
                 let selection = win2.selection();
                 selection.set_model(Some(&store));
                 win2.messages().scroll_to(