3 files changed, 40 insertions, 15 deletions
diff --git a/Swiften/Elements/Message.h b/Swiften/Elements/Message.h
index f6c16e4..0f0d380 100644
--- a/Swiften/Elements/Message.h
+++ b/Swiften/Elements/Message.h
@@ -1,22 +1,23 @@
 /*
- * Copyright (c) 2010-2015 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
+#include <string>
+
 #include <boost/optional.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/smart_ptr/make_shared.hpp>
 
-#include <string>
 #include <Swiften/Base/API.h>
 #include <Swiften/Elements/Body.h>
-#include <Swiften/Elements/Subject.h>
 #include <Swiften/Elements/ErrorPayload.h>
-#include <Swiften/Elements/Stanza.h>
 #include <Swiften/Elements/Replace.h>
+#include <Swiften/Elements/Stanza.h>
+#include <Swiften/Elements/Subject.h>
 
 namespace Swift {
 	class SWIFTEN_API Message : public Stanza {
@@ -45,16 +46,26 @@ namespace Swift {
 				return static_cast<bool>(getPayload<Subject>());
 			}
 
-			std::string getBody() const { 
+			boost::optional<std::string> getBody() const {
 				boost::shared_ptr<Body> body(getPayload<Body>());
+				boost::optional<std::string> bodyData;
 				if (body) {
-					return body->getText();
+					bodyData = body->getText();
 				}
-				return "";
+				return bodyData;
+			}
+
+			void setBody(const std::string& body) {
+				setBody(boost::optional<std::string>(body));
 			}
 
-			void setBody(const std::string& body) { 
-				updatePayload(boost::make_shared<Body>(body));
+			void setBody(const boost::optional<std::string>& body) {
+				if (body) {
+					updatePayload(boost::make_shared<Body>(body.get()));
+				}
+				else {
+					removePayloadOfSameType(boost::make_shared<Body>());
+				}
 			}
 
 			bool isError() {
diff --git a/Swiften/Elements/Stanza.cpp b/Swiften/Elements/Stanza.cpp
index 234878c..f385e1c 100644
--- a/Swiften/Elements/Stanza.cpp
+++ b/Swiften/Elements/Stanza.cpp
@@ -1,15 +1,17 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/Elements/Stanza.h>
-#include <Swiften/Elements/Delay.h>
 
 #include <typeinfo>
 
+#include <boost/bind.hpp>
+
 #include <Swiften/Base/foreach.h>
+#include <Swiften/Elements/Delay.h>
 
 namespace Swift {
 
@@ -30,6 +32,16 @@ void Stanza::updatePayload(boost::shared_ptr<Payload> payload) {
 	addPayload(payload);
 }
 
+static bool sameType(boost::shared_ptr<Payload> a, boost::shared_ptr<Payload> b) {
+	return typeid(*a.get()) == typeid(*b.get());
+}
+
+void Stanza::removePayloadOfSameType(boost::shared_ptr<Payload> payload) {
+	payloads_.erase(std::remove_if(payloads_.begin(), payloads_.end(),
+		boost::bind<bool>(&sameType, payload, _1)),
+		payloads_.end());
+}
+
 boost::shared_ptr<Payload> Stanza::getPayloadOfSameType(boost::shared_ptr<Payload> payload) const {
 	foreach (const boost::shared_ptr<Payload>& i, payloads_) {
 		if (typeid(*i.get()) == typeid(*payload.get())) {
diff --git a/Swiften/Elements/Stanza.h b/Swiften/Elements/Stanza.h
index 41df894..8da6280 100644
--- a/Swiften/Elements/Stanza.h
+++ b/Swiften/Elements/Stanza.h
@@ -1,16 +1,17 @@
 /*
- * Copyright (c) 2010-2014 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
-#include <vector>
 #include <string>
-#include <boost/shared_ptr.hpp>
-#include <boost/optional/optional_fwd.hpp>
+#include <vector>
+
 #include <boost/date_time/posix_time/ptime.hpp>
+#include <boost/optional/optional_fwd.hpp>
+#include <boost/shared_ptr.hpp>
 
 #include <Swiften/Base/API.h>
 #include <Swiften/Elements/ToplevelElement.h>
@@ -69,6 +70,7 @@ namespace Swift {
 
 			void updatePayload(boost::shared_ptr<Payload> payload);
 
+			void removePayloadOfSameType(boost::shared_ptr<Payload>);
 			boost::shared_ptr<Payload> getPayloadOfSameType(boost::shared_ptr<Payload>) const;
 
 			const JID& getFrom() const { return from_; }