1 files changed, 5 insertions, 11 deletions
diff --git a/Swiften/Serializer/PayloadSerializers/DelaySerializer.cpp b/Swiften/Serializer/PayloadSerializers/DelaySerializer.cpp
index 4922042..6148632 100644
--- a/Swiften/Serializer/PayloadSerializers/DelaySerializer.cpp
+++ b/Swiften/Serializer/PayloadSerializers/DelaySerializer.cpp
@@ -4,12 +4,14 @@
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
-#include "Swiften/Serializer/PayloadSerializers/DelaySerializer.h"
+#include <Swiften/Serializer/PayloadSerializers/DelaySerializer.h>
 
 #include <boost/shared_ptr.hpp>
+#include <boost/date_time/posix_time/posix_time.hpp>
 
 #include <Swiften/Base/String.h>
-#include "Swiften/Serializer/XML/XMLElement.h"
+#include <Swiften/Serializer/XML/XMLElement.h>
+#include <Swiften/Base/DateTime.h>
 
 namespace Swift {
 
@@ -21,16 +23,8 @@ std::string DelaySerializer::serializePayload(boost::shared_ptr<Delay> delay)  c
 	if (delay->getFrom()) {
 		delayElement.setAttribute("from", delay->getFrom()->toString());
 	}
-	std::string stampString = boostPTimeToXEP0082(delay->getStamp());
-	delayElement.setAttribute("stamp", stampString);
+	delayElement.setAttribute("stamp", dateTimeToString(delay->getStamp()));
 	return delayElement.serialize();
 }
 
-std::string DelaySerializer::boostPTimeToXEP0082(const boost::posix_time::ptime& time) {
-	std::string stampString = std::string(boost::posix_time::to_iso_extended_string(time));
-	String::replaceAll(stampString, ',', ".");
-	stampString += "Z";
-	return stampString;
-}
-
 }