diff --git a/apps/opencs/editor.cpp b/apps/opencs/editor.cpp
index ad6c4be3d7..b003735874 100644
--- a/apps/opencs/editor.cpp
+++ b/apps/opencs/editor.cpp
@@ -20,7 +20,7 @@
 #include "model/world/data.hpp"
 
 CS::Editor::Editor (OgreInit::OgreInit& ogreInit)
-: mDocumentManager (mCfgMgr), mViewManager (mDocumentManager),
+: mUserSettings (mCfgMgr), mDocumentManager (mCfgMgr), mViewManager (mDocumentManager),
   mIpcServerName ("org.openmw.OpenCS")
 {
     std::pair<Files::PathContainer, std::vector<std::string> > config = readConfig();
@@ -90,6 +90,9 @@ std::pair<Files::PathContainer, std::vector<std::string> > CS::Editor::readConfi
 
     mCfgMgr.readConfiguration(variables, desc);
 
+    mDocumentManager.setEncoding (
+        ToUTF8::calculateEncoding (variables["encoding"].as<std::string>()));
+
     mDocumentManager.setResourceDir (mResources = variables["resources"].as<std::string>());
 
     mFsStrict = variables["fs-strict"].as<bool>();
diff --git a/apps/opencs/model/doc/document.cpp b/apps/opencs/model/doc/document.cpp
index 06c4a09887..f452008ac9 100644
--- a/apps/opencs/model/doc/document.cpp
+++ b/apps/opencs/model/doc/document.cpp
@@ -2204,11 +2204,13 @@ void CSMDoc::Document::createBase()
 
 CSMDoc::Document::Document (const Files::ConfigurationManager& configuration,
     const std::vector< boost::filesystem::path >& files, bool new_,
-    const boost::filesystem::path& savePath, const boost::filesystem::path& resDir)
-: mSavePath (savePath), mContentFiles (files), mNew (new_), mTools (mData), mResDir(resDir),
+    const boost::filesystem::path& savePath, const boost::filesystem::path& resDir,
+    ToUTF8::FromType encoding)
+: mSavePath (savePath), mContentFiles (files), mNew (new_), mData (encoding), mTools (mData),
+  mResDir(resDir),
   mProjectPath ((configuration.getUserDataPath() / "projects") /
   (savePath.filename().string() + ".project")),
-  mSaving (*this, mProjectPath)
+  mSaving (*this, mProjectPath, encoding)
 {
     if (mContentFiles.empty())
         throw std::runtime_error ("Empty content file sequence");
diff --git a/apps/opencs/model/doc/document.hpp b/apps/opencs/model/doc/document.hpp
index 000f6761a0..a6f8aaae28 100644
--- a/apps/opencs/model/doc/document.hpp
+++ b/apps/opencs/model/doc/document.hpp
@@ -9,6 +9,8 @@
 #include <QObject>
 #include <QTimer>
 
+#include <components/to_utf8/to_utf8.hpp>
+
 #include "../world/data.hpp"
 
 #include "../tools/tools.hpp"
@@ -70,7 +72,8 @@ namespace CSMDoc
 
             Document (const Files::ConfigurationManager& configuration,
                 const std::vector< boost::filesystem::path >& files, bool new_,
-                const boost::filesystem::path& savePath, const boost::filesystem::path& resDir);
+                const boost::filesystem::path& savePath, const boost::filesystem::path& resDir,
+                ToUTF8::FromType encoding);
 
             ~Document();
 
diff --git a/apps/opencs/model/doc/documentmanager.cpp b/apps/opencs/model/doc/documentmanager.cpp
index d4f8eb110c..096864b772 100644
--- a/apps/opencs/model/doc/documentmanager.cpp
+++ b/apps/opencs/model/doc/documentmanager.cpp
@@ -13,7 +13,7 @@
 #include "document.hpp"
 
 CSMDoc::DocumentManager::DocumentManager (const Files::ConfigurationManager& configuration)
-: mConfiguration (configuration)
+: mConfiguration (configuration), mEncoding (ToUTF8::WINDOWS_1252)
 {
     boost::filesystem::path projectPath = configuration.getUserDataPath() / "projects";
 
@@ -52,7 +52,7 @@ CSMDoc::DocumentManager::~DocumentManager()
 void CSMDoc::DocumentManager::addDocument (const std::vector<boost::filesystem::path>& files, const boost::filesystem::path& savePath,
     bool new_)
 {
-    Document *document = new Document (mConfiguration, files, new_, savePath, mResDir);
+    Document *document = new Document (mConfiguration, files, new_, savePath, mResDir, mEncoding);
 
     mDocuments.push_back (document);
 
@@ -80,6 +80,11 @@ void CSMDoc::DocumentManager::setResourceDir (const boost::filesystem::path& par
     mResDir = boost::filesystem::system_complete(parResDir);
 }
 
+void CSMDoc::DocumentManager::setEncoding (ToUTF8::FromType encoding)
+{
+    mEncoding = encoding;
+}
+
 void CSMDoc::DocumentManager::documentLoaded (Document *document)
 {
     emit documentAdded (document);
diff --git a/apps/opencs/model/doc/documentmanager.hpp b/apps/opencs/model/doc/documentmanager.hpp
index 7b3a811fad..9b675826a2 100644
--- a/apps/opencs/model/doc/documentmanager.hpp
+++ b/apps/opencs/model/doc/documentmanager.hpp
@@ -9,6 +9,8 @@
 #include <QObject>
 #include <QThread>
 
+#include <components/to_utf8/to_utf8.hpp>
+
 #include "loader.hpp"
 
 namespace Files
@@ -28,6 +30,7 @@ namespace CSMDoc
             const Files::ConfigurationManager& mConfiguration;
             QThread mLoaderThread;
             Loader mLoader;
+            ToUTF8::FromType mEncoding;
 
             DocumentManager (const DocumentManager&);
             DocumentManager& operator= (const DocumentManager&);
@@ -45,6 +48,8 @@ namespace CSMDoc
 
 	    void setResourceDir (const boost::filesystem::path& parResDir);
 
+            void setEncoding (ToUTF8::FromType encoding);
+
         private:
 
 	    boost::filesystem::path mResDir;
diff --git a/apps/opencs/model/doc/saving.cpp b/apps/opencs/model/doc/saving.cpp
index 73278ba975..27d21635eb 100644
--- a/apps/opencs/model/doc/saving.cpp
+++ b/apps/opencs/model/doc/saving.cpp
@@ -8,8 +8,9 @@
 #include "savingstages.hpp"
 #include "document.hpp"
 
-CSMDoc::Saving::Saving (Document& document, const boost::filesystem::path& projectPath)
-: Operation (State_Saving, true, true), mDocument (document), mState (*this, projectPath)
+CSMDoc::Saving::Saving (Document& document, const boost::filesystem::path& projectPath,
+    ToUTF8::FromType encoding)
+: Operation (State_Saving, true, true), mDocument (document), mState (*this, projectPath, encoding)
 {
     // save project file
     appendStage (new OpenSaveStage (mDocument, mState, true));
diff --git a/apps/opencs/model/doc/saving.hpp b/apps/opencs/model/doc/saving.hpp
index cd1bbef980..44239b21b5 100644
--- a/apps/opencs/model/doc/saving.hpp
+++ b/apps/opencs/model/doc/saving.hpp
@@ -3,6 +3,8 @@
 
 #include <boost/filesystem/path.hpp>
 
+#include <components/to_utf8/to_utf8.hpp>
+
 #include "operation.hpp"
 #include "savingstate.hpp"
 
@@ -19,7 +21,8 @@ namespace CSMDoc
 
         public:
 
-            Saving (Document& document, const boost::filesystem::path& projectPath);
+            Saving (Document& document, const boost::filesystem::path& projectPath,
+                ToUTF8::FromType encoding);
 
     };
 }
diff --git a/apps/opencs/model/doc/savingstate.cpp b/apps/opencs/model/doc/savingstate.cpp
index 4a1abb8883..8742148226 100644
--- a/apps/opencs/model/doc/savingstate.cpp
+++ b/apps/opencs/model/doc/savingstate.cpp
@@ -4,11 +4,9 @@
 #include "operation.hpp"
 #include "document.hpp"
 
-CSMDoc::SavingState::SavingState (Operation& operation, const boost::filesystem::path& projectPath)
-: mOperation (operation),
-   /// \todo set encoding properly, once config implementation has been fixed.
-  mEncoder (ToUTF8::calculateEncoding ("win1252")),
-  mProjectPath (projectPath), mProjectFile (false)
+CSMDoc::SavingState::SavingState (Operation& operation, const boost::filesystem::path& projectPath,
+    ToUTF8::FromType encoding)
+: mOperation (operation), mEncoder (encoding),  mProjectPath (projectPath), mProjectFile (false)
 {
     mWriter.setEncoder (&mEncoder);
 }
diff --git a/apps/opencs/model/doc/savingstate.hpp b/apps/opencs/model/doc/savingstate.hpp
index 8cf7883e50..6b45655846 100644
--- a/apps/opencs/model/doc/savingstate.hpp
+++ b/apps/opencs/model/doc/savingstate.hpp
@@ -7,6 +7,8 @@
 
 #include <components/esm/esmwriter.hpp>
 
+#include <components/to_utf8/to_utf8.hpp>
+
 namespace CSMDoc
 {
     class Operation;
@@ -25,7 +27,8 @@ namespace CSMDoc
 
         public:
 
-            SavingState (Operation& operation, const boost::filesystem::path& projectPath);
+            SavingState (Operation& operation, const boost::filesystem::path& projectPath,
+                ToUTF8::FromType encoding);
 
             bool hasError() const;
 
diff --git a/apps/opencs/model/settings/usersettings.cpp b/apps/opencs/model/settings/usersettings.cpp
index 1a91254390..04f98f0d6c 100644
--- a/apps/opencs/model/settings/usersettings.cpp
+++ b/apps/opencs/model/settings/usersettings.cpp
@@ -28,7 +28,8 @@ namespace boost
 
 CSMSettings::UserSettings *CSMSettings::UserSettings::mUserSettingsInstance = 0;
 
-CSMSettings::UserSettings::UserSettings()
+CSMSettings::UserSettings::UserSettings (const Files::ConfigurationManager& configurationManager)
+: mCfgMgr (configurationManager)
 {
     assert(!mUserSettingsInstance);
     mUserSettingsInstance = this;
diff --git a/apps/opencs/model/settings/usersettings.hpp b/apps/opencs/model/settings/usersettings.hpp
index 830cc8c69f..7e553caf6e 100644
--- a/apps/opencs/model/settings/usersettings.hpp
+++ b/apps/opencs/model/settings/usersettings.hpp
@@ -30,7 +30,7 @@ namespace CSMSettings {
         Q_OBJECT
 
         static UserSettings *mUserSettingsInstance;
-        Files::ConfigurationManager mCfgMgr;
+        const Files::ConfigurationManager& mCfgMgr;
 
         QSettings *mSettingDefinitions;
         QList <Setting *> mSettings;
@@ -40,11 +40,11 @@ namespace CSMSettings {
         /// Singleton implementation
         static UserSettings& instance();
 
-        UserSettings();
+        UserSettings (const Files::ConfigurationManager& configurationManager);
         ~UserSettings();
 
-        UserSettings (UserSettings const &);        //not implemented
-        void operator= (UserSettings const &);      //not implemented
+        UserSettings (UserSettings const &); //not implemented
+        UserSettings& operator= (UserSettings const &); //not implemented
 
         /// Retrieves the settings file at all three levels (global, local and user).
         void loadSettings (const QString &fileName);
diff --git a/apps/opencs/model/world/data.cpp b/apps/opencs/model/world/data.cpp
index 3e9fe11eb0..ff33b46655 100644
--- a/apps/opencs/model/world/data.cpp
+++ b/apps/opencs/model/world/data.cpp
@@ -55,10 +55,8 @@ int CSMWorld::Data::count (RecordBase::State state, const CollectionBase& collec
     return number;
 }
 
-CSMWorld::Data::Data()
-/// \todo set encoding properly, once config implementation has been fixed.
-: mEncoder (ToUTF8::calculateEncoding ("win1252")),
-  mRefs (mCells), mReader (0), mDialogue (0)
+CSMWorld::Data::Data (ToUTF8::FromType encoding)
+: mEncoder (encoding), mRefs (mCells), mReader (0), mDialogue (0)
 {
     mGlobals.addColumn (new StringIdColumn<ESM::Global>);
     mGlobals.addColumn (new RecordStateColumn<ESM::Global>);
diff --git a/apps/opencs/model/world/data.hpp b/apps/opencs/model/world/data.hpp
index 4f7c624e68..ab247b6a34 100644
--- a/apps/opencs/model/world/data.hpp
+++ b/apps/opencs/model/world/data.hpp
@@ -22,6 +22,8 @@
 #include <components/esm/loadspel.hpp>
 #include <components/esm/loaddial.hpp>
 
+#include <components/to_utf8/to_utf8.hpp>
+
 #include "../filter/filter.hpp"
 
 #include "../doc/stage.hpp"
@@ -91,7 +93,7 @@ namespace CSMWorld
 
         public:
 
-            Data();
+            Data (ToUTF8::FromType encoding);
 
             virtual ~Data();
 
diff --git a/apps/opencs/view/doc/opendialog.cpp b/apps/opencs/view/doc/opendialog.cpp
deleted file mode 100644
index d107b198c6..0000000000
--- a/apps/opencs/view/doc/opendialog.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-#include <QVBoxLayout>
-#include <QDialogButtonBox>
-
-#include <components/fileorderlist/datafileslist.hpp>
-
-#include "opendialog.hpp"
-
-OpenDialog::OpenDialog(QWidget * parent) : QDialog(parent)
-{
-    QVBoxLayout *layout = new QVBoxLayout(this);
-    mFileSelector = new DataFilesList(mCfgMgr, this);
-    layout->addWidget(mFileSelector);
-
-    /// \todo move config to Editor class and add command line options.
-    // We use the Configuration Manager to retrieve the configuration values
-    boost::program_options::variables_map variables;
-    boost::program_options::options_description desc;
-
-    desc.add_options()
-    ("data", boost::program_options::value<Files::PathContainer>()->default_value(Files::PathContainer(), "data")->multitoken())
-    ("data-local", boost::program_options::value<std::string>()->default_value(""))
-    ("fs-strict", boost::program_options::value<bool>()->implicit_value(true)->default_value(false))
-    ("encoding", boost::program_options::value<std::string>()->default_value("win1252"));
-
-    boost::program_options::notify(variables);
-
-    mCfgMgr.readConfiguration(variables, desc);
-
-    Files::PathContainer mDataDirs, mDataLocal;
-    if (!variables["data"].empty()) {
-        mDataDirs = Files::PathContainer(variables["data"].as<Files::PathContainer>());
-    }
-
-    std::string local = variables["data-local"].as<std::string>();
-    if (!local.empty()) {
-        mDataLocal.push_back(Files::PathContainer::value_type(local));
-    }
-
-    mCfgMgr.processPaths(mDataDirs);
-    mCfgMgr.processPaths(mDataLocal);
-
-    // Set the charset for reading the esm/esp files
-    QString encoding = QString::fromUtf8 (variables["encoding"].as<std::string>().c_str());
-
-    Files::PathContainer dataDirs;
-    dataDirs.insert(dataDirs.end(), mDataDirs.begin(), mDataDirs.end());
-    dataDirs.insert(dataDirs.end(), mDataLocal.begin(), mDataLocal.end());
-    mFileSelector->setupDataFiles(dataDirs, encoding);
-
-    buttonBox = new QDialogButtonBox(QDialogButtonBox::Open | QDialogButtonBox::Cancel, Qt::Horizontal, this);
-    connect(buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
-    connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
-    layout->addWidget(buttonBox);
-
-    setLayout(layout);
-    setWindowTitle(tr("Open"));
-}
-
-void OpenDialog::getFileList(std::vector<boost::filesystem::path>& paths)
-{
-    mFileSelector->selectedFiles(paths);
-}
diff --git a/apps/opencs/view/doc/opendialog.hpp b/apps/opencs/view/doc/opendialog.hpp
deleted file mode 100644
index 6355aea44f..0000000000
--- a/apps/opencs/view/doc/opendialog.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <qdialog.h>
-#include <components/files/configurationmanager.hpp>
-
-class DataFilesList;
-class QDialogButtonBox;
-
-class OpenDialog : public QDialog {
-    Q_OBJECT
-public:
-    OpenDialog(QWidget * parent = 0);
-    
-    void getFileList(std::vector<boost::filesystem::path>& paths);
-private:
-    DataFilesList * mFileSelector;
-    QDialogButtonBox * buttonBox;
-    Files::ConfigurationManager mCfgMgr;
-};
\ No newline at end of file