diff --git a/controllers/documents_controller.php b/controllers/documents_controller.php
index fea9e323..34275802 100755
--- a/controllers/documents_controller.php
+++ b/controllers/documents_controller.php
@@ -245,12 +245,6 @@ class DocumentsController extends AppController {
 		$newDoc['DocPage'][$index]['document_id'] = null;
 	    }
 
-
-
-
-
-
-
 	}
 
 	else if (!empty($document['PurchaseOrder']['id'])) {
@@ -356,6 +350,18 @@ class DocumentsController extends AppController {
 		$newDoc['Document']['user_id']= $enquiry['Enquiry']['user_id'];
 		$newDoc['Document']['revision'] = 0; //No revisions for Order Acks. I have decreed it!
 		$newDoc['Document']['type'] = 'orderAck';
+		
+		if(isset($enquiry['BillingAddress']['id'])) {
+		    $newDoc['Document']['bill_to'] = '<b>'.$customer['Customer']['name'].'</b><br/>';
+		    $newDoc['Document']['bill_to'] .= $this->Document->OrderAcknowledgement->Enquiry->formatAddress($enquiry['BillingAddress']['id'], 'BillingAddress');
+		}
+
+		if(isset($enquiry['ShippingAddress']['id'])) {
+		    $newDoc['Document']['ship_to'] = '<b>'.$customer['Customer']['name'].'</b><br/>';
+		    $newDoc['Document']['ship_to'] .= $this->Document->OrderAcknowledgement->Enquiry->formatAddress($enquiry['ShippingAddress']['id'], 'ShippingAddress');
+		}
+
+
 
 		/** Copy the LineItems from this Document. Applies to all of the Document Types */
 		if(!empty($originalDoc['LineItem'])) {
@@ -554,6 +560,8 @@ class DocumentsController extends AppController {
 	$this->set('enquiry', $enquiry);
     }
 
+    
+
 
 }
 ?>
\ No newline at end of file
diff --git a/models/enquiry.php b/models/enquiry.php
index 82fe0772..5ad651a5 100755
--- a/models/enquiry.php
+++ b/models/enquiry.php
@@ -179,7 +179,7 @@ class Enquiry extends AppModel {
 
 	    'OrderAcknowledgement' => array('className'=>'OrderAcknowledgement', 'foreignKey'=>'enquiry_id')
 
-			    
+
 
     );
 
@@ -192,7 +192,33 @@ class Enquiry extends AppModel {
 	    )
     );
 
+    function formatAddress($id, $type) {
+
+	if($type == 'BillingAddress' || $type == 'ShippingAddress') {
+	    $address = $this->$type->find('first', array('conditions'=>array("$type.id"=>$id),'recursive'=>1));
+	}
+	else {
+	    return;
+	}
+
+	if($address[$type]['country_id'] == 1) { //Australian Address
+	    $formatted = <<<ENDADDRESS
+		    {$address[$type]['address']}<br/>
+		    {$address[$type]['city']}<br/>
+		    {$address['State']['shortform']} {$address[$type]['postcode']}<br/>
+ENDADDRESS;
+	}
+	else {
+	    $formatted = <<<ENDADDRESS
+		    {$address[$type]['address']}<br/>
+		    {$address[$type]['city']}<br/>
+		    {$address[$type]['postcode']}<br/>
+		    {$address['Country']['name']}<br/>
+ENDADDRESS;
+	}
+
+	return $formatted;
+    }
 
- 
 }
 ?>
diff --git a/vendors/pdfdoc.php b/vendors/pdfdoc.php
index 76af0f48..6b847270 100644
--- a/vendors/pdfdoc.php
+++ b/vendors/pdfdoc.php
@@ -16,7 +16,7 @@ class PDFDOC extends FPDI {
     function pageContent($content) {
 
 	$this->SetTextColor(0);
-	$this->SetFontSize(12);
+	$this->SetFontSize(11); //Changed from 12
 	$this->SetFont('times', '');
 
 	//$this->setY(50);