1 files changed, 7 insertions, 28 deletions
diff --git a/src/options.cpp b/src/parsingContext.cpp
index 9ec6056b..b440ef1e 100644
--- a/src/options.cpp
+++ b/src/parsingContext.cpp
@@ -21,49 +21,28 @@
 // the GNU General Public License cover the whole combination.
 //
 
-#include "vmime/options.hpp"
+#include "vmime/parsingContext.hpp"
 
 
 namespace vmime
 {
 
 
-options* options::getInstance()
+parsingContext::parsingContext()
 {
-	static options instance;
-	return (&instance);
 }
 
 
-options::multipartOptions::multipartOptions()
-	: m_prologText("This is a multi-part message in MIME format. Your mail reader " \
-	               "does not understand MIME message format."),
-	  m_epilogText("")
+parsingContext::parsingContext(const parsingContext& ctx)
+	: context()
 {
 }
 
 
-const string& options::multipartOptions::getPrologText() const
+parsingContext& parsingContext::getDefaultContext()
 {
-	return (m_prologText);
-}
-
-
-void options::multipartOptions::setPrologText(const string& prologText)
-{
-	m_prologText = prologText;
-}
-
-
-const string& options::multipartOptions::getEpilogText() const
-{
-	return (m_epilogText);
-}
-
-
-void options::multipartOptions::setEpilogText(const string& epilogText)
-{
-	m_epilogText = epilogText;
+	static parsingContext ctx;
+	return ctx;
 }