diff --git a/include/class.ticket.php b/include/class.ticket.php
index dc298c0840d13fbe40e5b6ce7fb2a7e711b75b28..a90f18bf49b8546d5c6215353b2ac60a4efec6c8 100644
--- a/include/class.ticket.php
+++ b/include/class.ticket.php
@@ -1895,9 +1895,12 @@ class Ticket {
         global $thisstaff;
 
         require_once(INCLUDE_DIR.'class.pdf.php');
-        if (!is_string($psize))
-            if (!$thisstaff || !($psize = $thisstaff->getDefaultPaperSize()))
+        if (!is_string($psize)) {
+            if ($_SESSION['PAPER_SIZE'])
+                $psize = $_SESSION['PAPER_SIZE'];
+            elseif (!$thisstaff || !($psize = $thisstaff->getDefaultPaperSize()))
                 $psize = 'Letter';
+        }
 
         $pdf = new Ticket2PDF($this, $psize, $notes);
         $name='Ticket-'.$this->getNumber().'.pdf';
diff --git a/include/staff/ticket-view.inc.php b/include/staff/ticket-view.inc.php
index d155e040cfb7446f5c546cedc5a3cdee77b58e55..df3ef92dcd061cb872f23cd166b20db3d4e4d0b8 100644
--- a/include/staff/ticket-view.inc.php
+++ b/include/staff/ticket-view.inc.php
@@ -78,9 +78,18 @@ if($ticket->isOverdue())
 
             <?php
             }?>
-
-            <a id="ticket-print" class="action-button" href="tickets.php?id=<?php echo $ticket->getId(); ?>&a=print"><i class="icon-print"></i> Print</a>
-
+            <span class="action-button" data-dropdown="#action-dropdown-print">
+                <a id="ticket-print" href="tickets.php?id=<?php echo $ticket->getId(); ?>&a=print"><i class="icon-print"></i> Print</a>
+                <i class="icon-caret-down"></i>
+            </span>
+            <div id="action-dropdown-print" class="action-dropdown anchor-right">
+              <ul>
+                 <li><a class="no-pjax" target="_blank" href="tickets.php?id=<?php echo $ticket->getId(); ?>&a=print&notes=0"><i
+                 class="icon-file-alt"></i> Ticket Thread</a>
+                 <li><a class="no-pjax" target="_blank" href="tickets.php?id=<?php echo $ticket->getId(); ?>&a=print&notes=1"><i
+                 class="icon-file-text-alt"></i> Thread + Internal Notes</a>
+              </ul>
+            </div>
             <div id="action-dropdown-more" class="action-dropdown anchor-right">
               <ul>
                 <?php