diff --git a/include/class.thread_actions.php b/include/class.thread_actions.php
index 1a1e1a39f0ea8431330ff1456bc9096b3b6edc6e..8cc2d785d2f2c29ab1274e4e349a9c3936e40784 100644
--- a/include/class.thread_actions.php
+++ b/include/class.thread_actions.php
@@ -136,7 +136,7 @@ class TEA_EditThreadEntry extends ThreadEntryAction {
             )
             || ($T instanceof Ticket
                 && ($role = $thisstaff->getRole($T->getDeptId(), $T->isAssigned($thisstaff)))
-               && $role->hasPerm(ThreadEntry::PERM_EDIT)
+                && $role->hasPerm(ThreadEntry::PERM_EDIT)
             )
         );
     }
diff --git a/include/staff/ticket-open.inc.php b/include/staff/ticket-open.inc.php
index a299117e88f672ec6a1349a300ba5fa71c41fc92..d19138676399500753db5d7ff641711999031295 100644
--- a/include/staff/ticket-open.inc.php
+++ b/include/staff/ticket-open.inc.php
@@ -14,7 +14,7 @@ if (!$user && $_GET['tid'] && ($entry = ThreadEntry::lookup($_GET['tid']))) {
     else
 
      $_SESSION[':form-data']['message'] = Format::htmlchars($entry->getBody());
-     if (($m= TicketForm::getInstance()->getField('subject'))) {
+     if (($m= TicketForm::getInstance()->getField('message'))) {
          $k = 'attach:'.$m->getId();
         foreach ($entry->getAttachments() as $a)
             if (!$a->inline && $a->file)