diff --git a/include/client/view.inc.php b/include/client/view.inc.php
index 3d81f7900c24cc55189aca35ee75970c194f6b73..8a6c2c4ee7d3b049a2e77e9c1ff1f3124cf40753 100644
--- a/include/client/view.inc.php
+++ b/include/client/view.inc.php
@@ -181,19 +181,15 @@ if($ticket->getThreadCount() && ($thread=$ticket->getClientThread())) {
                     data-draft-namespace="ticket.client"
                     data-draft-object-id="<?php echo $ticket->getId(); ?>"
                     class="richtext ifhtml draft"><?php echo $info['message']; ?></textarea>
-            </td>
-        </tr>
         <?php
         if ($messageField->isAttachmentsEnabled()) { ?>
-        <tr>
-            <td colspan="2">
 <?php
             print $attachments->render(true);
 ?>
-            </td>
-        </tr>
         <?php
         } ?>
+            </td>
+        </tr>
     </table>
     <p style="padding-left:165px;">
         <input type="submit" value="<?php echo __('Post Reply');?>">
diff --git a/tickets.php b/tickets.php
index 7adb4029fd86c40bd62da6405f089bf24d08239d..57b7ee0e8ec949c2d99a9ce8c63b2c11f9ba4bd6 100644
--- a/tickets.php
+++ b/tickets.php
@@ -123,6 +123,6 @@ if($ticket && $ticket->checkUserAccess($thisclient)) {
 }
 include(CLIENTINC_DIR.'header.inc.php');
 include(CLIENTINC_DIR.$inc);
-print $response_form->getMedia();
+print $tform->getMedia();
 include(CLIENTINC_DIR.'footer.inc.php');
 ?>