diff --git a/include/class.thread.php b/include/class.thread.php
index a717e89af82c02a521cd8d972ff3821812475c8b..0a37bd01c7b8fb5ce5e9bc10c3bb044c1d51bfa6 100644
--- a/include/class.thread.php
+++ b/include/class.thread.php
@@ -237,7 +237,7 @@ class Thread {
 }
 
 
-Class ThreadEntry {
+class ThreadEntry {
 
     var $id;
     var $ht;
@@ -341,6 +341,10 @@ Class ThreadEntry {
         return db_query($sql) && db_affected_rows();
     }
 
+    function getMessage() {
+        return $this->getBody();
+    }
+
     function getCreateDate() {
         return $this->ht['created'];
     }
@@ -1262,10 +1266,6 @@ class Note extends ThreadEntry {
         parent::ThreadEntry($id, 'N', $ticketId);
     }
 
-    function getMessage() {
-        return $this->getBody();
-    }
-
     /* static */
     function create($vars, &$errors) {
         return self::lookup(self::add($vars, $errors));
diff --git a/include/class.ticket.php b/include/class.ticket.php
index 3b7ff8afa351a3ca406f707a7f540394d60d1a70..464db39f1f485ecb4979eff65cac0cd4ef9aaf17 100644
--- a/include/class.ticket.php
+++ b/include/class.ticket.php
@@ -1260,6 +1260,7 @@ class Ticket {
 
         $msg = $this->replaceVars($msg->asArray(),
                 array(
+                    'note' => $vars['threadentry'], // For compatibility
                     'activity' => $vars['activity'],
                     'comments' => $vars['comments']));
 
diff --git a/include/i18n/en_US/help/tips/settings.alerts.yaml b/include/i18n/en_US/help/tips/settings.alerts.yaml
index 323e1bba55882b32dc31c9cdcc725b2e6aa55052..21951c9e9595c1f911f4c95b50602ea03595ace6 100644
--- a/include/i18n/en_US/help/tips/settings.alerts.yaml
+++ b/include/i18n/en_US/help/tips/settings.alerts.yaml
@@ -42,10 +42,10 @@ message_alert:
         href: /scp/templates.php?default_for=message.alert
 
 internal_note_alert:
-    title: New Internal Note Alert
+    title: New Internal Activity Alert
     content: >
-        Alert sent out to Agents when a new <span
-        class="doc-desc-title">Internal Note</span> is appended to a ticket.
+        Alert sent out to Agents when internal activity such as an internal
+        note or an agent reply is appended to a ticket.
     links:
       - title: Default Ticket Activity Template
         href: /scp/templates.php?default_for=note.alert
diff --git a/include/i18n/en_US/templates/email/note.alert.yaml b/include/i18n/en_US/templates/email/note.alert.yaml
index a704830d6bb3300607be5b3c7f0c6a55741b4955..5a1bcd91e3d69d21fe5b61ba4e1ab7cc9d2405e1 100644
--- a/include/i18n/en_US/templates/email/note.alert.yaml
+++ b/include/i18n/en_US/templates/email/note.alert.yaml
@@ -6,14 +6,14 @@
 #
 ---
 notes: |
-    Sent to staff members when a new internal note is appended to a ticket.
-    Internal notes can only be added by staff members.
+    Alert sent out to Agents when internal activity such as an internal
+    note or an agent reply is appended to a ticket.
 
 subject: |
-    New Internal Note Alert
+    New Internal Activity Alert
 body: |
     <h3><strong>Hi %{recipient.name},</strong></h3>
-    An internal note has been appended to ticket <a
+    An agent has logged activity on ticket <a
     href="%{ticket.staff_link}">#%{ticket.number}</a>
     <br>
     <br>
diff --git a/include/staff/settings-alerts.inc.php b/include/staff/settings-alerts.inc.php
index 14b3fee30ade06c2b8d190b83e276cb295dd2351..3a9326bc4127343b57831a14a81b8d50f1b5c5bb 100644
--- a/include/staff/settings-alerts.inc.php
+++ b/include/staff/settings-alerts.inc.php
@@ -88,7 +88,7 @@
                 <?php echo __('Organization Account Manager'); ?>
             </td>
         </tr>
-        <tr><th><em><b><?php echo __('New Internal Note Alert'); ?></b>:
+        <tr><th><em><b><?php echo __('New Internal Activity Alert'); ?></b>:
             <i class="help-tip icon-question-sign" href="#internal_note_alert"></i>
             </em></th></tr>
         <tr>