diff --git a/application/Espo/Controllers/Admin.php b/application/Espo/Controllers/Admin.php
index c42a790af3..a5ed380f64 100644
--- a/application/Espo/Controllers/Admin.php
+++ b/application/Espo/Controllers/Admin.php
@@ -12,7 +12,7 @@ class Admin extends \Espo\Core\Controllers\Base
 		if (!$this->getUser()->isAdmin()) {
         	throw new Forbidden();
 		}
-	}	
+	}
 
     public function actionRebuild($params, $data)
 	{
diff --git a/application/Espo/Controllers/ScheduledJob.php b/application/Espo/Controllers/ScheduledJob.php
new file mode 100644
index 0000000000..c6a94d8fa0
--- /dev/null
+++ b/application/Espo/Controllers/ScheduledJob.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Espo\Controllers;
+
+class ScheduledJob extends \Espo\Core\Controllers\Record
+{
+	protected function checkGlobalAccess()
+	{
+		if (!$this->getUser()->isAdmin()) {
+        	throw new Forbidden();
+		}
+	}
+}
+
diff --git a/application/Espo/Controllers/ScheduledJobLogRecord.php b/application/Espo/Controllers/ScheduledJobLogRecord.php
new file mode 100644
index 0000000000..8f687119b7
--- /dev/null
+++ b/application/Espo/Controllers/ScheduledJobLogRecord.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Espo\Controllers;
+
+class ScheduledJobLogRecord extends \Espo\Core\Controllers\Record
+{
+	protected function checkGlobalAccess()
+	{
+		if (!$this->getUser()->isAdmin()) {
+        	throw new Forbidden();
+		}
+	}
+}
+
diff --git a/application/Espo/Entities/ScheduledJob.php b/application/Espo/Entities/ScheduledJob.php
new file mode 100644
index 0000000000..6bdd533f09
--- /dev/null
+++ b/application/Espo/Entities/ScheduledJob.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Espo\Entities;
+
+class ScheduledJob extends \Espo\Core\ORM\Entity
+{
+
+}
diff --git a/application/Espo/Entities/ScheduledJobLogRecord.php b/application/Espo/Entities/ScheduledJobLogRecord.php
new file mode 100644
index 0000000000..ed6ae52680
--- /dev/null
+++ b/application/Espo/Entities/ScheduledJobLogRecord.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Espo\Entities;
+
+class ScheduledJobLogRecord extends \Espo\Core\ORM\Entity
+{
+
+}
diff --git a/application/Espo/Resources/layouts/ScheduledJob/detail.json b/application/Espo/Resources/layouts/ScheduledJob/detail.json
new file mode 100644
index 0000000000..fa1324a042
--- /dev/null
+++ b/application/Espo/Resources/layouts/ScheduledJob/detail.json
@@ -0,0 +1,9 @@
+[
+	{
+		"rows": [
+			[{"name": "name"}, {"name": "status"}],
+			[{"name": "job"}],
+			[{"name": "scheduling"}]
+		]
+	}
+]
diff --git a/application/Espo/Resources/layouts/ScheduledJob/list.json b/application/Espo/Resources/layouts/ScheduledJob/list.json
new file mode 100644
index 0000000000..e7d9baa3a6
--- /dev/null
+++ b/application/Espo/Resources/layouts/ScheduledJob/list.json
@@ -0,0 +1 @@
+[{"name":"name","width":30,"link":true},{"name":"job"},{"name":"status"}]
diff --git a/application/Espo/Resources/layouts/ScheduledJob/relationships.json b/application/Espo/Resources/layouts/ScheduledJob/relationships.json
new file mode 100644
index 0000000000..738879a3c1
--- /dev/null
+++ b/application/Espo/Resources/layouts/ScheduledJob/relationships.json
@@ -0,0 +1 @@
+["log"]
diff --git a/application/Espo/Resources/layouts/ScheduledJobLogRecord/listSmall.json b/application/Espo/Resources/layouts/ScheduledJobLogRecord/listSmall.json
new file mode 100644
index 0000000000..fddcca6aae
--- /dev/null
+++ b/application/Espo/Resources/layouts/ScheduledJobLogRecord/listSmall.json
@@ -0,0 +1 @@
+[{"name":"name"},{"name":"status"},{"name":"executionTime"},{"name":"createdAt"}]
diff --git a/application/Espo/Resources/metadata/app/adminPanel.json b/application/Espo/Resources/metadata/app/adminPanel.json
index 1cbe92f987..8fff28c5ea 100644
--- a/application/Espo/Resources/metadata/app/adminPanel.json
+++ b/application/Espo/Resources/metadata/app/adminPanel.json
@@ -7,6 +7,11 @@
             "label":"Settings",
             "description":"System settings of application."
          },
+         {
+            "url":"#ScheduledJob",
+            "label":"Scheduled Jobs",
+            "description":"Jobs which are executed by cron."
+         },
          {
             "url":"#Admin/clearCache",
             "label":"Clear Cache",
diff --git a/application/Espo/Resources/metadata/entityDefs/EmailTemplate.json b/application/Espo/Resources/metadata/entityDefs/EmailTemplate.json
index 46c4871770..3d8ffc017f 100644
--- a/application/Espo/Resources/metadata/entityDefs/EmailTemplate.json
+++ b/application/Espo/Resources/metadata/entityDefs/EmailTemplate.json
@@ -4,10 +4,6 @@
             "type": "varchar",
             "required": true
         },
-        "subject": {
-            "type": "varchar",
-            "required": true
-        },
         "body": {
             "type": "text"
         },
diff --git a/application/Espo/Resources/metadata/entityDefs/ScheduledJob.json b/application/Espo/Resources/metadata/entityDefs/ScheduledJob.json
new file mode 100644
index 0000000000..efe39071fe
--- /dev/null
+++ b/application/Espo/Resources/metadata/entityDefs/ScheduledJob.json
@@ -0,0 +1,55 @@
+{
+    "fields": {
+        "name": {
+            "type": "varchar",
+            "required": true
+        },
+        "job": {
+            "type": "varchar",
+            "required": true
+        },
+        "status": {
+            "type": "enum",
+            "options": ["Active", "Inactive"] 
+        },
+        "scheduling": {
+        	"type": "varchar",
+            "required": true        	
+		},
+        "createdAt": {
+            "type": "datetime",
+            "readOnly": true
+        },
+        "modifiedAt": {
+            "type": "datetime",
+            "readOnly": true
+        },
+        "createdBy": {
+            "type": "link",
+            "readOnly": true
+        },
+        "modifiedBy": {
+            "type": "link",
+            "readOnly": true
+        }
+    },
+    "links": {
+        "createdBy": {
+            "type": "belongsTo",
+            "entity": "User"
+        },
+        "modifiedBy": {
+            "type": "belongsTo",
+            "entity": "User"
+        },
+        "log": {
+        	"type": "hasMany",
+        	"entity": "ScheduledJobLogRecord",
+        	"foreign": "scheduledJob"
+        }
+    },
+    "collection": {
+    	"sortBy": "name",
+    	"asc": true
+    }
+}
diff --git a/application/Espo/Resources/metadata/entityDefs/ScheduledJobLogRecord.json b/application/Espo/Resources/metadata/entityDefs/ScheduledJobLogRecord.json
new file mode 100644
index 0000000000..f50b8f0d4b
--- /dev/null
+++ b/application/Espo/Resources/metadata/entityDefs/ScheduledJobLogRecord.json
@@ -0,0 +1,34 @@
+{
+    "fields": {
+        "name": {
+            "type": "varchar",
+            "required": true,
+             "readOnly": true
+        },
+        "status": {
+            "type": "varchar",
+             "readOnly": true
+        },
+        "executionTime": {
+            "type": "varchar",
+            "readOnly": true
+        },
+        "createdAt": {
+            "type": "datetime",
+            "readOnly": true
+        },
+        "scheduledJob": {
+        	"type": "link"
+		}
+    },
+    "links": {
+        "scheduledJob": {
+            "type": "belongsTo",
+            "entity": "ScheduledJob"
+        }
+    },
+    "collection": {
+    	"sortBy": "createdAt",
+    	"asc": false
+    }
+}
diff --git a/application/Espo/Resources/metadata/scopes/ScheduledJob.json b/application/Espo/Resources/metadata/scopes/ScheduledJob.json
new file mode 100644
index 0000000000..a64dc42037
--- /dev/null
+++ b/application/Espo/Resources/metadata/scopes/ScheduledJob.json
@@ -0,0 +1,7 @@
+{
+	"entity": true,
+	"layouts": false,
+	"tab": false,
+	"acl": false,
+	"customizable":false
+}
diff --git a/application/Espo/Resources/metadata/scopes/ScheduledJobLogRecord.json b/application/Espo/Resources/metadata/scopes/ScheduledJobLogRecord.json
new file mode 100644
index 0000000000..a64dc42037
--- /dev/null
+++ b/application/Espo/Resources/metadata/scopes/ScheduledJobLogRecord.json
@@ -0,0 +1,7 @@
+{
+	"entity": true,
+	"layouts": false,
+	"tab": false,
+	"acl": false,
+	"customizable":false
+}
diff --git a/application/Espo/Resources/metadata/viewDefs/ScheduledJob.json b/application/Espo/Resources/metadata/viewDefs/ScheduledJob.json
new file mode 100644
index 0000000000..f37a7e617f
--- /dev/null
+++ b/application/Espo/Resources/metadata/viewDefs/ScheduledJob.json
@@ -0,0 +1,7 @@
+{
+   "relationshipPanels":{
+      "log":{
+         "readOnly": true
+      }
+   }  
+}