diff --git a/src/plugins/messaging.rs b/src/plugins/messaging.rs
index aa8001f73869dcabf671579214b40fb8ecc23b6b..dd20651616b6d7be1b0f375263f3b900b1e25847 100644
--- a/src/plugins/messaging.rs
+++ b/src/plugins/messaging.rs
@@ -67,8 +67,7 @@ impl MessagingPlugin {
             from: None,
             to: Some(to.clone()),
             type_: MessageType::Chat,
-            // TODO: always use an id.
-            id: None,
+            id: Some(self.proxy.gen_id()),
             bodies: {
                 let mut bodies = BTreeMap::new();
                 bodies.insert(String::new(), String::from(body));
diff --git a/src/plugins/ping.rs b/src/plugins/ping.rs
index dbf21fda0209f5872fd7e24c42b800d85631e5c5..aeca7a215cd84dd5170c13b4abc01ef01ece15e1 100644
--- a/src/plugins/ping.rs
+++ b/src/plugins/ping.rs
@@ -53,8 +53,7 @@ impl PingPlugin {
         self.proxy.send(Iq {
             from: None,
             to: Some(to),
-            // TODO: use a generic way to generate ids.
-            id: Some(String::from("id")),
+            id: Some(self.proxy.gen_id()),
             payload: IqType::Get(IqPayload::Ping(Ping).into()),
         }.into());
         Ok(())
diff --git a/src/plugins/presence.rs b/src/plugins/presence.rs
index 344dd1f64636b492a700cdd234f5122a67f4d41e..42ee94c170b284e0e93825572a02fecb53e9ccd2 100644
--- a/src/plugins/presence.rs
+++ b/src/plugins/presence.rs
@@ -20,7 +20,7 @@ impl PresencePlugin {
         let presence = Presence {
             from: None,
             to: None,
-            id: None,
+            id: Some(self.proxy.gen_id()),
             type_: type_,
             show: show,
             priority: 0i8,