diff --git a/src/caps.rs b/src/caps.rs
index a63ab7f736e9759d3e45603b91fafa2b827b545b..77901ba165ad9aa2b0e828aa71fb8593e410d33b 100644
--- a/src/caps.rs
+++ b/src/caps.rs
@@ -6,6 +6,7 @@
 
 use try_from::TryFrom;
 
+use presence::PresencePayload;
 use disco::{Feature, Identity, DiscoInfoResult, DiscoInfoQuery};
 use data_forms::DataForm;
 use hashes::{Hash, Algo};
@@ -39,6 +40,8 @@ pub struct Caps {
     pub hash: Hash,
 }
 
+impl PresencePayload for Caps {}
+
 impl TryFrom<Element> for Caps {
     type Err = Error;
 
diff --git a/src/delay.rs b/src/delay.rs
index 21450da0382225a7d2b950434087ec4ba45e6ced..cd0a85f2b9616bbe1e60511eab28283023995f8b 100644
--- a/src/delay.rs
+++ b/src/delay.rs
@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+use presence::PresencePayload;
 use date::DateTime;
 
 use jid::Jid;
@@ -26,6 +27,8 @@ generate_element!(
     )
 );
 
+impl PresencePayload for Delay {}
+
 #[cfg(test)]
 mod tests {
     use super::*;
diff --git a/src/ecaps2.rs b/src/ecaps2.rs
index 4e40484d581f4148f082d5e946afe3938d698099..82ab1c4adfac58d1b293c0313f23e9430835b0f8 100644
--- a/src/ecaps2.rs
+++ b/src/ecaps2.rs
@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+use presence::PresencePayload;
 use disco::{Feature, Identity, DiscoInfoResult, DiscoInfoQuery};
 use data_forms::DataForm;
 use hashes::{Hash, Algo};
@@ -27,6 +28,8 @@ generate_element!(
     ]
 );
 
+impl PresencePayload for ECaps2 {}
+
 fn compute_item(field: &str) -> Vec<u8> {
     let mut bytes = field.as_bytes().to_vec();
     bytes.push(0x1f);
diff --git a/src/idle.rs b/src/idle.rs
index f96dadb5e5047e5d6ee97972a1c5d794838e438e..2704654735b03784db8855fa558a4f7aa9e548e6 100644
--- a/src/idle.rs
+++ b/src/idle.rs
@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+use presence::PresencePayload;
 use date::DateTime;
 
 generate_element!(
@@ -15,6 +16,8 @@ generate_element!(
     ]
 );
 
+impl PresencePayload for Idle {}
+
 #[cfg(test)]
 mod tests {
     use super::*;
diff --git a/src/muc/muc.rs b/src/muc/muc.rs
index 4d81b85c2a57776b741f7524769df4942b8e1f34..c363107a4f3f818a2293fa3a565c0700f9f0776d 100644
--- a/src/muc/muc.rs
+++ b/src/muc/muc.rs
@@ -5,6 +5,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+use presence::PresencePayload;
 use date::DateTime;
 
 generate_element!(
@@ -36,6 +37,8 @@ generate_element!(
     ]
 );
 
+impl PresencePayload for Muc {}
+
 #[cfg(test)]
 mod tests {
     use super::*;
diff --git a/src/presence.rs b/src/presence.rs
index 639bf04632c5efc58c340c4036d054f300bfa4e3..e81358fb8853fa83d3e379b93ade6a3467e27678 100644
--- a/src/presence.rs
+++ b/src/presence.rs
@@ -19,12 +19,8 @@ use error::Error;
 
 use ns;
 
-use stanza_error::StanzaError;
-use muc::Muc;
-use caps::Caps;
-use delay::Delay;
-use idle::Idle;
-use ecaps2::ECaps2;
+/// Should be implemented on every known payload of a `<presence/>`.
+pub trait PresencePayload: TryFrom<Element> + Into<Element> {}
 
 #[derive(Debug, Clone, PartialEq)]
 pub enum Show {
@@ -79,61 +75,6 @@ pub type Status = String;
 
 pub type Priority = i8;
 
-/// Lists every known payload of a `<presence/>`.
-#[derive(Debug, Clone)]
-pub enum PresencePayload {
-    StanzaError(StanzaError),
-    Muc(Muc),
-    Caps(Caps),
-    Delay(Delay),
-    Idle(Idle),
-    ECaps2(ECaps2),
-
-    Unknown(Element),
-}
-
-impl TryFrom<Element> for PresencePayload {
-    type Err = Error;
-
-    fn try_from(elem: Element) -> Result<PresencePayload, Error> {
-        Ok(match (elem.name().as_ref(), elem.ns().unwrap().as_ref()) {
-            ("error", ns::DEFAULT_NS) => PresencePayload::StanzaError(StanzaError::try_from(elem)?),
-
-            // XEP-0045
-            ("x", ns::MUC) => PresencePayload::Muc(Muc::try_from(elem)?),
-
-            // XEP-0115
-            ("c", ns::CAPS) => PresencePayload::Caps(Caps::try_from(elem)?),
-
-            // XEP-0203
-            ("delay", ns::DELAY) => PresencePayload::Delay(Delay::try_from(elem)?),
-
-            // XEP-0319
-            ("idle", ns::IDLE) => PresencePayload::Idle(Idle::try_from(elem)?),
-
-            // XEP-0390
-            ("c", ns::ECAPS2) => PresencePayload::ECaps2(ECaps2::try_from(elem)?),
-
-            _ => PresencePayload::Unknown(elem),
-        })
-    }
-}
-
-impl From<PresencePayload> for Element {
-    fn from(payload: PresencePayload) -> Element {
-        match payload {
-            PresencePayload::StanzaError(stanza_error) => stanza_error.into(),
-            PresencePayload::Muc(muc) => muc.into(),
-            PresencePayload::Caps(caps) => caps.into(),
-            PresencePayload::Delay(delay) => delay.into(),
-            PresencePayload::Idle(idle) => idle.into(),
-            PresencePayload::ECaps2(ecaps2) => ecaps2.into(),
-
-            PresencePayload::Unknown(elem) => elem,
-        }
-    }
-}
-
 #[derive(Debug, Clone, PartialEq)]
 pub enum Type {
     /// This value is not an acceptable 'type' attribute, it is only used
diff --git a/src/stanza_error.rs b/src/stanza_error.rs
index edec4d5bd6fdb0853ffe9cb19a9372f4774764be..be2766144081942a90d7ffce153e2e457423b34e 100644
--- a/src/stanza_error.rs
+++ b/src/stanza_error.rs
@@ -9,6 +9,7 @@ use std::collections::BTreeMap;
 
 use minidom::Element;
 
+use presence::PresencePayload;
 use error::Error;
 use jid::Jid;
 use ns;
@@ -212,6 +213,8 @@ pub struct StanzaError {
     pub other: Option<Element>,
 }
 
+impl PresencePayload for StanzaError {}
+
 impl TryFrom<Element> for StanzaError {
     type Err = Error;