diff --git a/CHANGELOG.md b/CHANGELOG.md
index f235abdc2b8edbcb5884cc25c5fbd2aa329519dd..e089b2a03f90961aac7427fc1f3b0b4889a033f2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+Version 1.3
+===========
+
+* Implemented the help text of an action on the edit action screen.
+
 Version 1.2
 ===========
 
diff --git a/ang/form_processor/actions/ActionDialogCtrl.html b/ang/form_processor/actions/ActionDialogCtrl.html
index 5b5ef78271c9e05575dfb98e14c5712060ad8b98..0c1b8457bec58cc27253dfdf4e7b219fb1227a18 100644
--- a/ang/form_processor/actions/ActionDialogCtrl.html
+++ b/ang/form_processor/actions/ActionDialogCtrl.html
@@ -2,8 +2,18 @@
   <div class="crm-block crm-form-block" ng-form="ActionForm" crm-ui-id-scope>
     	
   	<div crm-ui-field="{name: 'ActionForm.type', title: ts('Type')}">
-  		<div>{{action.type.title}}</div>
+  		<div>{{actionTitles[action.type]}}</div>
+	</div>
+
+	<div class="crm-section" ng-if="actionType.help_text">
+		<div class="label">&nbsp;</div>
+		<div class="content">
+    		<div class="help">
+				{{actionType.help_text}}
+			</div>
 		</div>
+		<div class="clear"></div>
+	</div>
   	
   	<div crm-ui-field="{name: 'ActionForm.title', title: ts('Title'), required: true}">
     <input
diff --git a/ang/form_processor/actions/ActionDialogCtrl.js b/ang/form_processor/actions/ActionDialogCtrl.js
index c142a05c74ecabaa5d6796fa7f38a6c27e34c3a9..9f6ee6fd20690fa8132464e134270dacd09b796a 100644
--- a/ang/form_processor/actions/ActionDialogCtrl.js
+++ b/ang/form_processor/actions/ActionDialogCtrl.js
@@ -5,13 +5,13 @@
     
     $scope.action = angular.copy($scope.model.action);
     $scope.actionType = $scope.model.actionType;
+    $scope.actionTitles = CRM.form_processor.actionTitles;
     if (Object.prototype.toString.call($scope.action.configuration) == '[object Array]') {
       $scope.action.configuration = {};
     }
     if (Object.prototype.toString.call($scope.action.mapping) == '[object Array]') {
       $scope.action.mapping = {};
     }
-    $scope.model.context;
     
     $scope.locks = {name: true};
     $scope.isNameValid = false;