diff --git a/app/Ninja/Repositories/PaymentRepository.php b/app/Ninja/Repositories/PaymentRepository.php
index 4d6683744a5a..34d6555c8923 100644
--- a/app/Ninja/Repositories/PaymentRepository.php
+++ b/app/Ninja/Repositories/PaymentRepository.php
@@ -189,6 +189,9 @@ class PaymentRepository extends BaseRepository
         if (isset($input['transaction_reference'])) {
             $payment->transaction_reference = trim($input['transaction_reference']);
         }
+        if (isset($input['private_notes'])) {
+            $payment->private_notes = trim($input['private_notes']);
+        }
 
         if (! $publicId) {
             $clientId = $input['client_id'];
diff --git a/resources/views/export/clients.blade.php b/resources/views/export/clients.blade.php
index d2ad3c95ce38..ad4f7f38033c 100644
--- a/resources/views/export/clients.blade.php
+++ b/resources/views/export/clients.blade.php
@@ -15,6 +15,8 @@
     <td>{{ trans('texts.vat_number') }}</td>
     <td>{{ trans('texts.website') }}</td>
     <td>{{ trans('texts.phone') }}</td>
+    <td>{{ trans('texts.public_notes') }}</td>
+    <td>{{ trans('texts.private_notes') }}</td>
     @if ($account->custom_client_label1)
         <td>{{ $account->custom_client_label1 }}</td>
     @endif
@@ -41,6 +43,8 @@
         <td>{{ $client->vat_number }}</td>
         <td>{{ $client->website }}</td>
         <td>{{ $client->work_phone }}</td>
+        <td>{{ $client->public_notes }}</td>
+        <td>{{ $client->private_notes }}</td>
         @if ($account->custom_client_label1)
             <td>{{ $client->custom_value1 }}</td>
         @endif
diff --git a/resources/views/export/invoices.blade.php b/resources/views/export/invoices.blade.php
index 1e99f85b1b14..fb995727539d 100644
--- a/resources/views/export/invoices.blade.php
+++ b/resources/views/export/invoices.blade.php
@@ -11,6 +11,8 @@
     <td>{{ trans('texts.status') }}</td>
     <td>{{ trans(isset($entityType) && $entityType == ENTITY_QUOTE ? 'texts.quote_date' : 'texts.invoice_date') }}</td>
     <td>{{ trans('texts.due_date') }}</td>
+    <td>{{ trans('texts.public_notes') }}</td>
+    <td>{{ trans('texts.private_notes') }}</td>
     @if ($account->custom_invoice_label1)
         <td>{{ $account->custom_invoice_label1 }}</td>
     @endif
@@ -40,6 +42,8 @@
             <td>{{ $invoice->present()->status }}</td>
             <td>{{ $invoice->present()->invoice_date }}</td>
             <td>{{ $invoice->present()->due_date }}</td>
+            <td>{{ $invoice->public_notes }}</td>
+            <td>{{ $invoice->private_notes }}</td>            
             @if ($account->custom_invoice_label1)
                 <td>{{ $invoice->custom_value1 }}</td>
             @endif
diff --git a/resources/views/export/payments.blade.php b/resources/views/export/payments.blade.php
index 81cee2297df4..898cae71e992 100644
--- a/resources/views/export/payments.blade.php
+++ b/resources/views/export/payments.blade.php
@@ -8,6 +8,7 @@
     <td>{{ trans('texts.payment_date') }}</td>
     <td>{{ trans('texts.method') }}</td>
     <td>{{ trans('texts.transaction_reference') }}</td>
+    <td>{{ trans('texts.private_notes') }}</td>
 </tr>
 
 @foreach ($payments as $payment)
@@ -22,6 +23,7 @@
             <td>{{ $payment->present()->payment_date }}</td>
             <td>{{ $payment->present()->method }}</td>
             <td>{{ $payment->transaction_reference }}</td>
+            <td>{{ $payment->private_notes }}</td>
         </tr>
     @endif
 @endforeach
diff --git a/resources/views/payments/edit.blade.php b/resources/views/payments/edit.blade.php
index d64ca35aba38..aa974d7c0cb9 100644
--- a/resources/views/payments/edit.blade.php
+++ b/resources/views/payments/edit.blade.php
@@ -69,6 +69,7 @@
                         ->addGroupClass('payment_date')
                         ->append('<i class="glyphicon glyphicon-calendar"></i>') !!}
 			{!! Former::text('transaction_reference') !!}
+            {!! Former::textarea('private_notes') !!}
 
             @if (!$payment)
                 {!! Former::checkbox('email_receipt')