diff --git a/apps/opencs/CMakeLists.txt b/apps/opencs/CMakeLists.txt
index 76d4280c8..bd882892f 100644
--- a/apps/opencs/CMakeLists.txt
+++ b/apps/opencs/CMakeLists.txt
@@ -55,7 +55,7 @@ opencs_hdrs_noqt (view/doc
 
 
 opencs_units (view/world
-    table tablesubview
+    table tablesubview scriptsubview
     )
 
 opencs_units_noqt (view/world
diff --git a/apps/opencs/model/world/columnbase.hpp b/apps/opencs/model/world/columnbase.hpp
index 23049164f..fea618037 100644
--- a/apps/opencs/model/world/columnbase.hpp
+++ b/apps/opencs/model/world/columnbase.hpp
@@ -35,7 +35,8 @@ namespace CSMWorld
             Display_Specialisation,
             Display_Attribute,
             Display_Boolean,
-            Display_SpellType
+            Display_SpellType,
+            Display_Script
         };
 
         std::string mTitle;
diff --git a/apps/opencs/model/world/columns.hpp b/apps/opencs/model/world/columns.hpp
index 6d6d1b1ef..9242e8a23 100644
--- a/apps/opencs/model/world/columns.hpp
+++ b/apps/opencs/model/world/columns.hpp
@@ -723,6 +723,31 @@ namespace CSMWorld
             return true;
         }
     };
+
+    template<typename ESXRecordT>
+    struct ScriptColumn : public Column<ESXRecordT>
+    {
+        ScriptColumn() : Column<ESXRecordT> ("Script", ColumnBase::Display_Script, 0) {}
+
+        virtual QVariant get (const Record<ESXRecordT>& record) const
+        {
+            return QString::fromUtf8 (record.get().mScriptText.c_str());
+        }
+
+        virtual void set (Record<ESXRecordT>& record, const QVariant& data)
+        {
+            ESXRecordT record2 = record.get();
+
+            record2.mScriptText = data.toString().toUtf8().constData();
+
+            record.setModified (record2);
+        }
+
+        virtual bool isEditable() const
+        {
+            return true;
+        }
+    };
 }
 
 #endif
\ No newline at end of file
diff --git a/apps/opencs/model/world/data.cpp b/apps/opencs/model/world/data.cpp
index 14aff47e8..9f6b186c0 100644
--- a/apps/opencs/model/world/data.cpp
+++ b/apps/opencs/model/world/data.cpp
@@ -93,6 +93,7 @@ CSMWorld::Data::Data()
     mScripts.addColumn (new StringIdColumn<ESM::Script>);
     mScripts.addColumn (new RecordStateColumn<ESM::Script>);
     mScripts.addColumn (new FixedRecordTypeColumn<ESM::Script> (UniversalId::Type_Script));
+    mScripts.addColumn (new ScriptColumn<ESM::Script>);
 
     mRegions.addColumn (new StringIdColumn<ESM::Region>);
     mRegions.addColumn (new RecordStateColumn<ESM::Region>);
diff --git a/apps/opencs/view/world/scriptsubview.cpp b/apps/opencs/view/world/scriptsubview.cpp
new file mode 100644
index 000000000..2fdb44aec
--- /dev/null
+++ b/apps/opencs/view/world/scriptsubview.cpp
@@ -0,0 +1,92 @@
+
+#include "scriptsubview.hpp"
+
+#include <stdexcept>
+
+#include <QTextEdit>
+
+#include "../../model/doc/document.hpp"
+#include "../../model/world/universalid.hpp"
+#include "../../model/world/data.hpp"
+#include "../../model/world/columnbase.hpp"
+#include "../../model/world/commands.hpp"
+#include "../../model/world/idtable.hpp"
+
+CSVWorld::ScriptSubView::ChangeLock::ChangeLock (ScriptSubView& view) : mView (view)
+{
+    ++mView.mChangeLocked;
+}
+
+CSVWorld::ScriptSubView::ChangeLock::~ChangeLock()
+{
+    --mView.mChangeLocked;
+}
+
+CSVWorld::ScriptSubView::ScriptSubView (const CSMWorld::UniversalId& id, CSMDoc::Document& document)
+: SubView (id), mDocument (document), mColumn (-1), mChangeLocked (0)
+{
+    setWidget (mEditor = new QTextEdit (this));
+
+    mEditor->setAcceptRichText (false);
+    mEditor->setLineWrapMode (QTextEdit::NoWrap);
+    mEditor->setTabStopWidth (4);
+    mEditor->setUndoRedoEnabled (false); // we use OpenCS-wide undo/redo instead
+
+    mModel = &dynamic_cast<CSMWorld::IdTable&> (
+        *document.getData().getTableModel (CSMWorld::UniversalId::Type_Scripts));
+
+    for (int i=0; i<mModel->columnCount(); ++i)
+        if (mModel->headerData (i, Qt::Horizontal, CSMWorld::ColumnBase::Role_Display)==
+            CSMWorld::ColumnBase::Display_Script)
+        {
+            mColumn = i;
+            break;
+        }
+
+    if (mColumn==-1)
+        throw std::logic_error ("Can't find script column");
+
+    mEditor->setPlainText (mModel->data (mModel->getModelIndex (id.getId(), mColumn)).toString());
+
+    connect (mEditor, SIGNAL (textChanged()), this, SLOT (textChanged()));
+
+    connect (mModel, SIGNAL (dataChanged (const QModelIndex&, const QModelIndex&)),
+        this, SLOT (dataChanged (const QModelIndex&, const QModelIndex&)));
+
+//    connect (mModel, SIGNAL (rowsAboutToBeRemoved (const QModelIndex&, int start, int end)),
+//        this, SLOT (rowsAboutToBeRemoved (const QModelIndex&, int start, int end)));
+}
+
+void CSVWorld::ScriptSubView::setEditLock (bool locked)
+{
+    mEditor->setReadOnly (locked);
+}
+
+void CSVWorld::ScriptSubView::textChanged()
+{
+    ChangeLock lock (*this);
+
+    mDocument.getUndoStack().push (new CSMWorld::ModifyCommand (*mModel,
+        mModel->getModelIndex (getUniversalId().getId(), mColumn), mEditor->toPlainText()));
+}
+
+void CSVWorld::ScriptSubView::dataChanged (const QModelIndex& topLeft, const QModelIndex& bottomRight)
+{
+    if (mChangeLocked)
+        return;
+
+    QModelIndex index = mModel->getModelIndex (getUniversalId().getId(), mColumn);
+
+    if (index.row()>=topLeft.row() && index.row()<=bottomRight.row() &&
+        index.column()>=topLeft.column() && index.column()<=bottomRight.column())
+    {
+        QTextCursor cursor = mEditor->textCursor();
+        mEditor->setPlainText (mModel->data (index).toString());
+        mEditor->setTextCursor (cursor);
+    }
+}
+
+void CSVWorld::ScriptSubView::rowsAboutToBeRemoved (const QModelIndex& parent, int start, int end)
+{
+
+}
\ No newline at end of file
diff --git a/apps/opencs/view/world/scriptsubview.hpp b/apps/opencs/view/world/scriptsubview.hpp
new file mode 100644
index 000000000..07d87d947
--- /dev/null
+++ b/apps/opencs/view/world/scriptsubview.hpp
@@ -0,0 +1,62 @@
+#ifndef CSV_WORLD_SCRIPTSUBVIEW_H
+#define CSV_WORLD_SCRIPTSUBVIEW_H
+
+#include "../doc/subview.hpp"
+
+class QTextEdit;
+class QModelIndex;
+
+namespace CSMDoc
+{
+    class Document;
+}
+
+namespace CSMWorld
+{
+    class IdTable;
+}
+
+namespace CSVWorld
+{
+    class ScriptSubView : public CSVDoc::SubView
+    {
+            Q_OBJECT
+
+            QTextEdit *mEditor;
+            CSMDoc::Document& mDocument;
+            CSMWorld::IdTable *mModel;
+            int mColumn;
+            int mChangeLocked;
+
+            class ChangeLock
+            {
+                    ScriptSubView& mView;
+
+                    ChangeLock (const ChangeLock&);
+                    ChangeLock& operator= (const ChangeLock&);
+
+                public:
+
+                    ChangeLock (ScriptSubView& view);
+                    ~ChangeLock();
+            };
+
+            friend class ChangeLock;
+
+        public:
+
+            ScriptSubView (const CSMWorld::UniversalId& id, CSMDoc::Document& document);
+
+            virtual void setEditLock (bool locked);
+
+        private slots:
+
+            void textChanged();
+
+            void dataChanged (const QModelIndex& topLeft, const QModelIndex& bottomRight);
+
+            void rowsAboutToBeRemoved (const QModelIndex& parent, int start, int end);
+    };
+}
+
+#endif
\ No newline at end of file
diff --git a/apps/opencs/view/world/subviews.cpp b/apps/opencs/view/world/subviews.cpp
index c9ef4df8d..8f7887f3b 100644
--- a/apps/opencs/view/world/subviews.cpp
+++ b/apps/opencs/view/world/subviews.cpp
@@ -5,6 +5,7 @@
 
 #include "tablesubview.hpp"
 #include "dialoguesubview.hpp"
+#include "scriptsubview.hpp"
 
 void CSVWorld::addSubViewFactories (CSVDoc::SubViewFactoryManager& manager)
 {
@@ -32,6 +33,7 @@ void CSVWorld::addSubViewFactories (CSVDoc::SubViewFactoryManager& manager)
     for (int i=0; sTableTypes[i]!=CSMWorld::UniversalId::Type_None; ++i)
         manager.add (sTableTypes[i], new CSVDoc::SubViewFactoryWithCreateFlag<TableSubView> (true));
 
+    manager.add (CSMWorld::UniversalId::Type_Script, new CSVDoc::SubViewFactory<ScriptSubView>);
 
 //    manager.add (CSMWorld::UniversalId::Type_Global,
 //        new CSVDoc::SubViewFactoryWithCreateFlag<DialogueSubView> (true));