diff --git a/include/class.ticket.php b/include/class.ticket.php
index 167cfc18d92a4297c7371a191c64a3f80dbe8e83..c7dc74953f748102a7526ebee4e58c0812a4e138 100644
--- a/include/class.ticket.php
+++ b/include/class.ticket.php
@@ -1875,9 +1875,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 d28cab8c7908ecf7e6404b24eb60a6631e46a866..4042692d48e075e196d4b8cbdedec5e15ff08a46 100644
--- a/include/staff/ticket-view.inc.php
+++ b/include/staff/ticket-view.inc.php
@@ -80,9 +80,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 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 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