1 files changed, 12 insertions, 0 deletions
diff --git a/stanza/src/client/message.rs b/stanza/src/client/message.rs
index d94b82e..78258ca 100644
--- a/stanza/src/client/message.rs
+++ b/stanza/src/client/message.rs
@@ -6,6 +6,8 @@ use peanuts::{
     DeserializeError, Element, XML_NS,
 };
 
+#[cfg(feature = "xep_0060")]
+use crate::xep_0060::event::Event;
 #[cfg(feature = "xep_0131")]
 use crate::xep_0131::Headers;
 #[cfg(feature = "xep_0172")]
@@ -33,6 +35,8 @@ pub struct Message {
     pub headers: Option<Headers>,
     #[cfg(feature = "xep_0172")]
     pub nick: Option<Nick>,
+    #[cfg(feature = "xep_0060")]
+    pub event: Option<Event>,
 }
 
 impl FromElement for Message {
@@ -59,6 +63,9 @@ impl FromElement for Message {
         #[cfg(feature = "xep_0172")]
         let nick = element.child_opt()?;
 
+        #[cfg(feature = "xep_0060")]
+        let event = element.child_opt()?;
+
         Ok(Message {
             from,
             id,
@@ -74,6 +81,8 @@ impl FromElement for Message {
             headers,
             #[cfg(feature = "xep_0172")]
             nick,
+            #[cfg(feature = "xep_0060")]
+            event,
         })
     }
 }
@@ -105,6 +114,9 @@ impl IntoElement for Message {
         #[cfg(feature = "xep_0172")]
         let builder = builder.push_child_opt(self.nick.clone());
 
+        #[cfg(feature = "xep_0060")]
+        let builder = builder.push_child_opt(self.event.clone());
+
         builder
     }
 }