diff --git a/apps/opencs/model/world/columnimp.hpp b/apps/opencs/model/world/columnimp.hpp
index 8e73cc244..d31d7cf29 100644
--- a/apps/opencs/model/world/columnimp.hpp
+++ b/apps/opencs/model/world/columnimp.hpp
@@ -1709,6 +1709,55 @@ namespace CSMWorld
             return true;
         }
     };
+
+    template<typename ESXRecordT>
+    struct ChargesColumn2 : public Column<ESXRecordT>
+    {
+        ChargesColumn2() : Column<ESXRecordT> (Columns::ColumnId_Charges, ColumnBase::Display_Integer) {}
+
+        virtual QVariant get (const Record<ESXRecordT>& record) const
+        {
+            return record.get().mData.mCharge;
+        }
+
+        virtual void set (Record<ESXRecordT>& record, const QVariant& data)
+        {
+            ESXRecordT record2 = record.get();
+            record2.mData.mCharge = data.toInt();
+            record.setModified (record2);
+        }
+
+        virtual bool isEditable() const
+        {
+            return true;
+        }
+    };
+
+    template<typename ESXRecordT>
+    struct AutoCalcColumn : public Column<ESXRecordT>
+    {
+        AutoCalcColumn() : Column<ESXRecordT> (Columns::ColumnId_AutoCalc, ColumnBase::Display_Boolean)
+        {}
+
+        virtual QVariant get (const Record<ESXRecordT>& record) const
+        {
+            return record.get().mData.mAutocalc!=0;
+        }
+
+        virtual void set (Record<ESXRecordT>& record, const QVariant& data)
+        {
+            ESXRecordT record2 = record.get();
+
+            record2.mData.mAutocalc = data.toInt();
+
+            record.setModified (record2);
+        }
+
+        virtual bool isEditable() const
+        {
+            return true;
+        }
+    };
 }
 
 #endif
diff --git a/apps/opencs/model/world/columns.cpp b/apps/opencs/model/world/columns.cpp
index 0292b2c5e..4f88e7b1b 100644
--- a/apps/opencs/model/world/columns.cpp
+++ b/apps/opencs/model/world/columns.cpp
@@ -178,6 +178,7 @@ namespace CSMWorld
             { ColumnId_MagicState, "Magic" },
             { ColumnId_StealthState, "Stealth" },
             { ColumnId_EnchantmentType, "Enchantment Type" },
+            { ColumnId_AutoCalc, "Auto Calc" },
 
             { ColumnId_UseValue1, "Use value 1" },
             { ColumnId_UseValue2, "Use value 2" },
diff --git a/apps/opencs/model/world/data.cpp b/apps/opencs/model/world/data.cpp
index bc2d5287e..12de19a82 100644
--- a/apps/opencs/model/world/data.cpp
+++ b/apps/opencs/model/world/data.cpp
@@ -202,9 +202,9 @@ CSMWorld::Data::Data (ToUTF8::FromType encoding)
     mEnchantments.addColumn (new RecordStateColumn<ESM::Enchantment>);
     mEnchantments.addColumn (new FixedRecordTypeColumn<ESM::Enchantment> (UniversalId::Type_Enchantment));
     mEnchantments.addColumn (new EnchantmentTypeColumn<ESM::Enchantment>);
-
     mEnchantments.addColumn (new CostColumn<ESM::Enchantment>);
-
+    mEnchantments.addColumn (new ChargesColumn2<ESM::Enchantment>);
+    mEnchantments.addColumn (new AutoCalcColumn<ESM::Enchantment>);
 
     mRefs.addColumn (new StringIdColumn<CellRef> (true));
     mRefs.addColumn (new RecordStateColumn<CellRef>);
diff --git a/apps/opencs/view/world/subviews.cpp b/apps/opencs/view/world/subviews.cpp
index 8d6246696..c1b5393d3 100644
--- a/apps/opencs/view/world/subviews.cpp
+++ b/apps/opencs/view/world/subviews.cpp
@@ -93,6 +93,7 @@ void CSVWorld::addSubViewFactories (CSVDoc::SubViewFactoryManager& manager)
         CSMWorld::UniversalId::Type_Filter,
         CSMWorld::UniversalId::Type_Sound,
         CSMWorld::UniversalId::Type_Faction,
+        CSMWorld::UniversalId::Type_Enchantment,
 
         CSMWorld::UniversalId::Type_None // end marker
     };