1 files changed, 9 insertions, 4 deletions
diff --git a/sleekxmpp/plugins/xep_0203/stanza.py b/sleekxmpp/plugins/xep_0203/stanza.py
index baae4cd3..e147e975 100644
--- a/sleekxmpp/plugins/xep_0203/stanza.py
+++ b/sleekxmpp/plugins/xep_0203/stanza.py
@@ -8,23 +8,28 @@
 
 import datetime as dt
 
+from sleekxmpp.jid import JID
 from sleekxmpp.xmlstream import ElementBase
 from sleekxmpp.plugins import xep_0082
 
 
 class Delay(ElementBase):
 
-    """
-    """
-
     name = 'delay'
     namespace = 'urn:xmpp:delay'
     plugin_attrib = 'delay'
     interfaces = set(('from', 'stamp', 'text'))
 
+    def get_from(self):
+        from_ = self._get_attr('from')
+        return JID(from_) if from_ else None
+
+    def set_from(self, value):
+        self._set_attr('from', str(value))
+
     def get_stamp(self):
         timestamp = self._get_attr('stamp')
-        return xep_0082.parse(timestamp)
+        return xep_0082.parse(timestamp) if timestamp else None
 
     def set_stamp(self, value):
         if isinstance(value, dt.datetime):