diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index ce5965be1..3223ab1a7 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -40,7 +40,7 @@ add_component_dir (esm
     loadinfo loadingr loadland loadlevlist loadligh loadlock loadprob loadrepa loadltex loadmgef loadmisc loadnpcc
     loadnpc loadpgrd loadrace loadregn loadscpt loadskil loadsndg loadsoun loadspel loadsscr loadstat
     loadweap records aipackage effectlist spelllist variant variantimp loadtes3 cellref filter
-    savedgame
+    savedgame journalentry queststate
     )
 
 add_component_dir (misc
diff --git a/components/esm/defs.hpp b/components/esm/defs.hpp
index 5a5ef9f1c..03091d9d8 100644
--- a/components/esm/defs.hpp
+++ b/components/esm/defs.hpp
@@ -85,6 +85,8 @@ enum RecNameInts
 
     // format 0 - saved games
     REC_SAVE = 0x45564153,
+    REC_JOUR = 0x524f55a4,
+    REC_QUES = 0x53455551,
 
     // format 1
     REC_FILT = 0x544C4946
diff --git a/components/esm/journalentry.cpp b/components/esm/journalentry.cpp
new file mode 100644
index 000000000..514bf3597
--- /dev/null
+++ b/components/esm/journalentry.cpp
@@ -0,0 +1,35 @@
+
+#include "journalentry.hpp"
+
+#include "esmreader.hpp"
+#include "esmwriter.hpp"
+
+void ESM::JournalEntry::load (ESMReader &esm)
+{
+    esm.getHNOT (mType, "JETY");
+    mTopic = esm.getHNString ("YETO");
+    mInfo = esm.getHNString ("YEIN");
+    mText = esm.getHNString ("TEXT");
+
+    if (mType==Type_Journal)
+    {
+        esm.getHNT (mDay, "JEDA");
+        esm.getHNT (mMonth, "JEMO");
+        esm.getHNT (mDayOfMonth, "JEDM");
+    }
+}
+
+void ESM::JournalEntry::save (ESMWriter &esm) const
+{
+    esm.writeHNT ("JETY", mType);
+    esm.writeHNString ("YETO", mTopic);
+    esm.writeHNString ("YEIN", mInfo);
+    esm.writeHNString ("TEXT", mText);
+
+    if (mType==Type_Journal)
+    {
+        esm.writeHNT ("JEDA", mDay);
+        esm.writeHNT ("JEMO", mMonth);
+        esm.writeHNT ("JEDM", mDayOfMonth);
+    }
+}
\ No newline at end of file
diff --git a/components/esm/journalentry.hpp b/components/esm/journalentry.hpp
new file mode 100644
index 000000000..94808dde6
--- /dev/null
+++ b/components/esm/journalentry.hpp
@@ -0,0 +1,35 @@
+#ifndef OPENMW_ESM_JOURNALENTRY_H
+#define OPENMW_ESM_JOURNALENTRY_H
+
+#include <string>
+
+namespace ESM
+{
+    class ESMReader;
+    class ESMWriter;
+
+    // format 0, saved games only
+
+    struct JournalEntry
+    {
+        enum Type
+        {
+            Type_Journal = 0,
+            Type_Topic = 1,
+            Type_Quest = 2
+        };
+
+        int mType;
+        std::string mTopic;
+        std::string mInfo;
+        std::string mText;
+        int mDay; // time stamp
+        int mMonth;
+        int mDayOfMonth;
+
+        void load (ESMReader &esm);
+        void save (ESMWriter &esm) const;
+    };
+}
+
+#endif
diff --git a/components/esm/queststate.cpp b/components/esm/queststate.cpp
new file mode 100644
index 000000000..5931e8b90
--- /dev/null
+++ b/components/esm/queststate.cpp
@@ -0,0 +1,19 @@
+
+#include "queststate.hpp"
+
+#include "esmreader.hpp"
+#include "esmwriter.hpp"
+
+void ESM::QuestState::load (ESMReader &esm)
+{
+    mTopic = esm.getHNString ("YETO");
+    esm.getHNOT (mState, "QSTAT");
+    esm.getHNOT (mFinished, "QFIN");
+}
+
+void ESM::QuestState::save (ESMWriter &esm) const
+{
+    esm.writeHNString ("YETO", mTopic);
+    esm.writeHNT ("QSTAT", mState);
+    esm.writeHNT ("QFIN", mFinished);
+}
\ No newline at end of file
diff --git a/components/esm/queststate.hpp b/components/esm/queststate.hpp
new file mode 100644
index 000000000..1769336f2
--- /dev/null
+++ b/components/esm/queststate.hpp
@@ -0,0 +1,24 @@
+#ifndef OPENMW_ESM_QUESTSTATE_H
+#define OPENMW_ESM_QUESTSTATE_H
+
+#include <string>
+
+namespace ESM
+{
+    class ESMReader;
+    class ESMWriter;
+
+    // format 0, saved games only
+
+    struct QuestState
+    {
+        std::string mTopic;
+        int mState;
+        unsigned char mFinished;
+
+        void load (ESMReader &esm);
+        void save (ESMWriter &esm) const;
+    };
+}
+
+#endif
\ No newline at end of file