diff --git a/app/Http/Controllers/ClientPortalController.php b/app/Http/Controllers/ClientPortalController.php
index 7d8f51c1ff90..c583835fd49d 100644
--- a/app/Http/Controllers/ClientPortalController.php
+++ b/app/Http/Controllers/ClientPortalController.php
@@ -523,7 +523,7 @@ class ClientPortalController extends BaseController
           'account' => $account,
           'title' => trans('texts.credits'),
           'entityType' => ENTITY_CREDIT,
-          'columns' => Utils::trans(['credit_date', 'credit_amount', 'credit_balance']),
+          'columns' => Utils::trans(['credit_date', 'credit_amount', 'credit_balance', 'notes']),
         ];
 
         return response()->view('public_list', $data);
diff --git a/app/Models/Credit.php b/app/Models/Credit.php
index e1b4243b8e13..1205d981bbc3 100644
--- a/app/Models/Credit.php
+++ b/app/Models/Credit.php
@@ -23,6 +23,14 @@ class Credit extends EntityModel
      */
     protected $presenter = 'App\Ninja\Presenters\CreditPresenter';
 
+    /**
+     * @var array
+     */
+    protected $fillable = [
+        'public_notes',
+        'private_notes',
+    ];
+
     /**
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
diff --git a/app/Ninja/Datatables/CreditDatatable.php b/app/Ninja/Datatables/CreditDatatable.php
index 18fc935f9926..2fd96e09155e 100644
--- a/app/Ninja/Datatables/CreditDatatable.php
+++ b/app/Ninja/Datatables/CreditDatatable.php
@@ -47,6 +47,12 @@ class CreditDatatable extends EntityDatatable
                     return link_to("credits/{$model->public_id}/edit", Utils::fromSqlDate($model->credit_date_sql))->toHtml();
                 },
             ],
+            [
+                'public_notes',
+                function ($model) {
+                    return $model->public_notes;
+                },
+            ],
             [
                 'private_notes',
                 function ($model) {
diff --git a/app/Ninja/Repositories/CreditRepository.php b/app/Ninja/Repositories/CreditRepository.php
index 7d797e7d657f..8e982602eefe 100644
--- a/app/Ninja/Repositories/CreditRepository.php
+++ b/app/Ninja/Repositories/CreditRepository.php
@@ -38,6 +38,7 @@ class CreditRepository extends BaseRepository
                         'contacts.last_name',
                         'contacts.email',
                         'credits.private_notes',
+                        'credits.public_notes',
                         'credits.deleted_at',
                         'credits.is_deleted',
                         'credits.user_id'
@@ -74,7 +75,8 @@ class CreditRepository extends BaseRepository
                         DB::raw('COALESCE(clients.country_id, accounts.country_id) country_id'),
                         'credits.amount',
                         'credits.balance',
-                        'credits.credit_date'
+                        'credits.credit_date',
+                        'credits.public_notes'
                     );
 
         $table = \Datatable::query($query)
@@ -87,6 +89,9 @@ class CreditRepository extends BaseRepository
             ->addColumn('balance', function ($model) {
                 return Utils::formatMoney($model->balance, $model->currency_id, $model->country_id);
             })
+            ->addColumn('public_notes', function ($model) {
+                return $model->public_notes;
+            })
             ->make();
 
         return $table;
@@ -111,6 +116,7 @@ class CreditRepository extends BaseRepository
         $credit->credit_date = Utils::toSqlDate($input['credit_date']);
         $credit->amount = Utils::parseFloat($input['amount']);
         $credit->private_notes = trim($input['private_notes']);
+        $credit->public_notes = trim($input['public_notes']);
         $credit->save();
 
         return $credit;
diff --git a/app/Ninja/Transformers/CreditTransformer.php b/app/Ninja/Transformers/CreditTransformer.php
index 752e3dbec0dc..f36bef9573ce 100644
--- a/app/Ninja/Transformers/CreditTransformer.php
+++ b/app/Ninja/Transformers/CreditTransformer.php
@@ -26,6 +26,7 @@ class CreditTransformer extends EntityTransformer
             'credit_date' => $credit->credit_date,
             'credit_number' => $credit->credit_number,
             'private_notes' => $credit->private_notes,
+            'public_notes' => $credit->public_notes,
         ]);
     }
 }
diff --git a/database/migrations/2017_03_16_085702_add_gateway_fee_location.php b/database/migrations/2017_03_16_085702_add_gateway_fee_location.php
index 28ed85e0826c..15b919b9b026 100644
--- a/database/migrations/2017_03_16_085702_add_gateway_fee_location.php
+++ b/database/migrations/2017_03_16_085702_add_gateway_fee_location.php
@@ -31,6 +31,10 @@ class AddGatewayFeeLocation extends Migration
             $table->integer('quote_number_counter')->default(1)->nullable();
         });
 
+        Schema::table('credits', function ($table) {
+            $table->text('public_notes')->nullable();
+        });
+
         // update invoice_item_type_id for task invoice items
         DB::statement('update invoice_items
             left join invoices on invoices.id = invoice_items.invoice_id
@@ -54,5 +58,9 @@ class AddGatewayFeeLocation extends Migration
             $table->dropColumn('invoice_number_counter');
             $table->dropColumn('quote_number_counter');
         });
+
+        Schema::table('credits', function ($table) {
+            $table->dropColumn('public_notes');
+        });
     }
 }
diff --git a/database/setup.sql b/database/setup.sql
index def58eeeaf33..a2196deb7c70 100644
--- a/database/setup.sql
+++ b/database/setup.sql
@@ -764,6 +764,7 @@ CREATE TABLE `credits` (
   `credit_number` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   `private_notes` text COLLATE utf8_unicode_ci NOT NULL,
   `public_id` int(10) unsigned NOT NULL,
+  `public_notes` text COLLATE utf8_unicode_ci,
   PRIMARY KEY (`id`),
   UNIQUE KEY `credits_account_id_public_id_unique` (`account_id`,`public_id`),
   KEY `credits_user_id_foreign` (`user_id`),
@@ -1147,7 +1148,7 @@ CREATE TABLE `gateways` (
 
 LOCK TABLES `gateways` WRITE;
 /*!40000 ALTER TABLE `gateways` DISABLE KEYS */;
-INSERT INTO `gateways` VALUES (1,'2017-03-29 15:28:13','2017-03-29 15:28:13','Authorize.Net AIM','AuthorizeNet_AIM',1,1,4,0,NULL,0,0),(2,'2017-03-29 15:28:13','2017-03-29 15:28:13','Authorize.Net SIM','AuthorizeNet_SIM',1,2,10000,0,NULL,0,0),(3,'2017-03-29 15:28:13','2017-03-29 15:28:13','CardSave','CardSave',1,1,10000,0,NULL,0,0),(4,'2017-03-29 15:28:13','2017-03-29 15:28:13','Eway Rapid','Eway_RapidShared',1,1,10000,0,NULL,1,0),(5,'2017-03-29 15:28:13','2017-03-29 15:28:13','FirstData Connect','FirstData_Connect',1,1,10000,0,NULL,0,0),(6,'2017-03-29 15:28:13','2017-03-29 15:28:13','GoCardless','GoCardless',1,1,10000,0,NULL,1,0),(7,'2017-03-29 15:28:13','2017-03-29 15:28:13','Migs ThreeParty','Migs_ThreeParty',1,1,10000,0,NULL,0,0),(8,'2017-03-29 15:28:13','2017-03-29 15:28:13','Migs TwoParty','Migs_TwoParty',1,1,10000,0,NULL,0,0),(9,'2017-03-29 15:28:13','2017-03-29 15:28:13','Mollie','Mollie',1,1,7,0,NULL,1,0),(10,'2017-03-29 15:28:13','2017-03-29 15:28:13','MultiSafepay','MultiSafepay',1,1,10000,0,NULL,0,0),(11,'2017-03-29 15:28:13','2017-03-29 15:28:13','Netaxept','Netaxept',1,1,10000,0,NULL,0,0),(12,'2017-03-29 15:28:13','2017-03-29 15:28:13','NetBanx','NetBanx',1,1,10000,0,NULL,0,0),(13,'2017-03-29 15:28:13','2017-03-29 15:28:13','PayFast','PayFast',1,1,10000,0,NULL,1,0),(14,'2017-03-29 15:28:13','2017-03-29 15:28:13','Payflow Pro','Payflow_Pro',1,1,10000,0,NULL,0,0),(15,'2017-03-29 15:28:13','2017-03-29 15:28:13','PaymentExpress PxPay','PaymentExpress_PxPay',1,1,10000,0,NULL,0,0),(16,'2017-03-29 15:28:13','2017-03-29 15:28:13','PaymentExpress PxPost','PaymentExpress_PxPost',1,1,10000,0,NULL,0,0),(17,'2017-03-29 15:28:13','2017-03-29 15:28:13','PayPal Express','PayPal_Express',1,1,3,0,NULL,1,0),(18,'2017-03-29 15:28:13','2017-03-29 15:28:13','PayPal Pro','PayPal_Pro',1,1,10000,0,NULL,0,0),(19,'2017-03-29 15:28:13','2017-03-29 15:28:13','Pin','Pin',1,1,10000,0,NULL,0,0),(20,'2017-03-29 15:28:13','2017-03-29 15:28:13','SagePay Direct','SagePay_Direct',1,1,10000,0,NULL,0,0),(21,'2017-03-29 15:28:13','2017-03-29 15:28:13','SagePay Server','SagePay_Server',1,1,10000,0,NULL,0,0),(22,'2017-03-29 15:28:13','2017-03-29 15:28:13','SecurePay DirectPost','SecurePay_DirectPost',1,1,10000,0,NULL,0,0),(23,'2017-03-29 15:28:13','2017-03-29 15:28:13','Stripe','Stripe',1,1,1,0,NULL,0,0),(24,'2017-03-29 15:28:13','2017-03-29 15:28:13','TargetPay Direct eBanking','TargetPay_Directebanking',1,1,10000,0,NULL,0,0),(25,'2017-03-29 15:28:13','2017-03-29 15:28:13','TargetPay Ideal','TargetPay_Ideal',1,1,10000,0,NULL,0,0),(26,'2017-03-29 15:28:13','2017-03-29 15:28:13','TargetPay Mr Cash','TargetPay_Mrcash',1,1,10000,0,NULL,0,0),(27,'2017-03-29 15:28:13','2017-03-29 15:28:13','TwoCheckout','TwoCheckout',1,1,10000,0,NULL,1,0),(28,'2017-03-29 15:28:13','2017-03-29 15:28:13','WorldPay','WorldPay',1,1,10000,0,NULL,0,0),(29,'2017-03-29 15:28:13','2017-03-29 15:28:13','BeanStream','BeanStream',1,2,10000,0,NULL,0,0),(30,'2017-03-29 15:28:13','2017-03-29 15:28:13','Psigate','Psigate',1,2,10000,0,NULL,0,0),(31,'2017-03-29 15:28:13','2017-03-29 15:28:13','moolah','AuthorizeNet_AIM',1,1,10000,0,NULL,0,0),(32,'2017-03-29 15:28:13','2017-03-29 15:28:13','Alipay','Alipay_Express',1,1,10000,0,NULL,0,0),(33,'2017-03-29 15:28:13','2017-03-29 15:28:13','Buckaroo','Buckaroo_CreditCard',1,1,10000,0,NULL,0,0),(34,'2017-03-29 15:28:13','2017-03-29 15:28:13','Coinbase','Coinbase',1,1,10000,0,NULL,0,0),(35,'2017-03-29 15:28:13','2017-03-29 15:28:13','DataCash','DataCash',1,1,10000,0,NULL,0,0),(36,'2017-03-29 15:28:13','2017-03-29 15:28:13','Neteller','Neteller',1,2,10000,0,NULL,0,0),(37,'2017-03-29 15:28:13','2017-03-29 15:28:13','Pacnet','Pacnet',1,1,10000,0,NULL,0,0),(38,'2017-03-29 15:28:13','2017-03-29 15:28:13','PaymentSense','PaymentSense',1,2,10000,0,NULL,0,0),(39,'2017-03-29 15:28:13','2017-03-29 15:28:13','Realex','Realex_Remote',1,1,10000,0,NULL,0,0),(40,'2017-03-29 15:28:13','2017-03-29 15:28:13','Sisow','Sisow',1,1,10000,0,NULL,0,0),(41,'2017-03-29 15:28:13','2017-03-29 15:28:13','Skrill','Skrill',1,1,10000,0,NULL,1,0),(42,'2017-03-29 15:28:13','2017-03-29 15:28:13','BitPay','BitPay',1,1,6,0,NULL,1,0),(43,'2017-03-29 15:28:13','2017-03-29 15:28:13','Dwolla','Dwolla',1,1,5,0,NULL,1,0),(44,'2017-03-29 15:28:13','2017-03-29 15:28:13','AGMS','Agms',1,1,10000,0,NULL,0,0),(45,'2017-03-29 15:28:13','2017-03-29 15:28:13','Barclays','BarclaysEpdq\\Essential',1,1,10000,0,NULL,0,0),(46,'2017-03-29 15:28:13','2017-03-29 15:28:13','Cardgate','Cardgate',1,1,10000,0,NULL,0,0),(47,'2017-03-29 15:28:13','2017-03-29 15:28:13','Checkout.com','CheckoutCom',1,1,10000,0,NULL,0,0),(48,'2017-03-29 15:28:13','2017-03-29 15:28:13','Creditcall','Creditcall',1,1,10000,0,NULL,0,0),(49,'2017-03-29 15:28:13','2017-03-29 15:28:13','Cybersource','Cybersource',1,1,10000,0,NULL,0,0),(50,'2017-03-29 15:28:13','2017-03-29 15:28:13','ecoPayz','Ecopayz',1,1,10000,0,NULL,0,0),(51,'2017-03-29 15:28:13','2017-03-29 15:28:13','Fasapay','Fasapay',1,1,10000,0,NULL,0,0),(52,'2017-03-29 15:28:13','2017-03-29 15:28:13','Komoju','Komoju',1,1,10000,0,NULL,0,0),(53,'2017-03-29 15:28:13','2017-03-29 15:28:13','Multicards','Multicards',1,1,10000,0,NULL,0,0),(54,'2017-03-29 15:28:13','2017-03-29 15:28:13','Pagar.Me','Pagarme',1,2,10000,0,NULL,0,0),(55,'2017-03-29 15:28:13','2017-03-29 15:28:13','Paysafecard','Paysafecard',1,1,10000,0,NULL,0,0),(56,'2017-03-29 15:28:13','2017-03-29 15:28:13','Paytrace','Paytrace_CreditCard',1,1,10000,0,NULL,0,0),(57,'2017-03-29 15:28:13','2017-03-29 15:28:13','Secure Trading','SecureTrading',1,1,10000,0,NULL,0,0),(58,'2017-03-29 15:28:13','2017-03-29 15:28:13','SecPay','SecPay',1,1,10000,0,NULL,0,0),(59,'2017-03-29 15:28:13','2017-03-29 15:28:13','WeChat Express','WeChat_Express',1,2,10000,0,NULL,0,0),(60,'2017-03-29 15:28:13','2017-03-29 15:28:13','WePay','WePay',1,1,10000,0,NULL,0,0),(61,'2017-03-29 15:28:13','2017-03-29 15:28:13','Braintree','Braintree',1,1,2,0,NULL,0,0),(62,'2017-03-29 15:28:13','2017-03-29 15:28:13','Custom','Custom',1,1,8,0,NULL,1,0);
+INSERT INTO `gateways` VALUES (1,'2017-03-30 05:35:29','2017-03-30 05:35:29','Authorize.Net AIM','AuthorizeNet_AIM',1,1,4,0,NULL,0,0),(2,'2017-03-30 05:35:29','2017-03-30 05:35:29','Authorize.Net SIM','AuthorizeNet_SIM',1,2,10000,0,NULL,0,0),(3,'2017-03-30 05:35:29','2017-03-30 05:35:29','CardSave','CardSave',1,1,10000,0,NULL,0,0),(4,'2017-03-30 05:35:29','2017-03-30 05:35:29','Eway Rapid','Eway_RapidShared',1,1,10000,0,NULL,1,0),(5,'2017-03-30 05:35:29','2017-03-30 05:35:29','FirstData Connect','FirstData_Connect',1,1,10000,0,NULL,0,0),(6,'2017-03-30 05:35:29','2017-03-30 05:35:29','GoCardless','GoCardless',1,1,10000,0,NULL,1,0),(7,'2017-03-30 05:35:29','2017-03-30 05:35:29','Migs ThreeParty','Migs_ThreeParty',1,1,10000,0,NULL,0,0),(8,'2017-03-30 05:35:29','2017-03-30 05:35:29','Migs TwoParty','Migs_TwoParty',1,1,10000,0,NULL,0,0),(9,'2017-03-30 05:35:29','2017-03-30 05:35:29','Mollie','Mollie',1,1,7,0,NULL,1,0),(10,'2017-03-30 05:35:29','2017-03-30 05:35:29','MultiSafepay','MultiSafepay',1,1,10000,0,NULL,0,0),(11,'2017-03-30 05:35:29','2017-03-30 05:35:29','Netaxept','Netaxept',1,1,10000,0,NULL,0,0),(12,'2017-03-30 05:35:29','2017-03-30 05:35:29','NetBanx','NetBanx',1,1,10000,0,NULL,0,0),(13,'2017-03-30 05:35:29','2017-03-30 05:35:29','PayFast','PayFast',1,1,10000,0,NULL,1,0),(14,'2017-03-30 05:35:29','2017-03-30 05:35:29','Payflow Pro','Payflow_Pro',1,1,10000,0,NULL,0,0),(15,'2017-03-30 05:35:29','2017-03-30 05:35:29','PaymentExpress PxPay','PaymentExpress_PxPay',1,1,10000,0,NULL,0,0),(16,'2017-03-30 05:35:29','2017-03-30 05:35:29','PaymentExpress PxPost','PaymentExpress_PxPost',1,1,10000,0,NULL,0,0),(17,'2017-03-30 05:35:29','2017-03-30 05:35:29','PayPal Express','PayPal_Express',1,1,3,0,NULL,1,0),(18,'2017-03-30 05:35:29','2017-03-30 05:35:29','PayPal Pro','PayPal_Pro',1,1,10000,0,NULL,0,0),(19,'2017-03-30 05:35:29','2017-03-30 05:35:29','Pin','Pin',1,1,10000,0,NULL,0,0),(20,'2017-03-30 05:35:29','2017-03-30 05:35:29','SagePay Direct','SagePay_Direct',1,1,10000,0,NULL,0,0),(21,'2017-03-30 05:35:29','2017-03-30 05:35:29','SagePay Server','SagePay_Server',1,1,10000,0,NULL,0,0),(22,'2017-03-30 05:35:29','2017-03-30 05:35:29','SecurePay DirectPost','SecurePay_DirectPost',1,1,10000,0,NULL,0,0),(23,'2017-03-30 05:35:29','2017-03-30 05:35:29','Stripe','Stripe',1,1,1,0,NULL,0,0),(24,'2017-03-30 05:35:29','2017-03-30 05:35:29','TargetPay Direct eBanking','TargetPay_Directebanking',1,1,10000,0,NULL,0,0),(25,'2017-03-30 05:35:29','2017-03-30 05:35:29','TargetPay Ideal','TargetPay_Ideal',1,1,10000,0,NULL,0,0),(26,'2017-03-30 05:35:29','2017-03-30 05:35:29','TargetPay Mr Cash','TargetPay_Mrcash',1,1,10000,0,NULL,0,0),(27,'2017-03-30 05:35:29','2017-03-30 05:35:29','TwoCheckout','TwoCheckout',1,1,10000,0,NULL,1,0),(28,'2017-03-30 05:35:29','2017-03-30 05:35:29','WorldPay','WorldPay',1,1,10000,0,NULL,0,0),(29,'2017-03-30 05:35:29','2017-03-30 05:35:29','BeanStream','BeanStream',1,2,10000,0,NULL,0,0),(30,'2017-03-30 05:35:29','2017-03-30 05:35:29','Psigate','Psigate',1,2,10000,0,NULL,0,0),(31,'2017-03-30 05:35:29','2017-03-30 05:35:29','moolah','AuthorizeNet_AIM',1,1,10000,0,NULL,0,0),(32,'2017-03-30 05:35:29','2017-03-30 05:35:29','Alipay','Alipay_Express',1,1,10000,0,NULL,0,0),(33,'2017-03-30 05:35:29','2017-03-30 05:35:29','Buckaroo','Buckaroo_CreditCard',1,1,10000,0,NULL,0,0),(34,'2017-03-30 05:35:29','2017-03-30 05:35:29','Coinbase','Coinbase',1,1,10000,0,NULL,0,0),(35,'2017-03-30 05:35:29','2017-03-30 05:35:29','DataCash','DataCash',1,1,10000,0,NULL,0,0),(36,'2017-03-30 05:35:29','2017-03-30 05:35:29','Neteller','Neteller',1,2,10000,0,NULL,0,0),(37,'2017-03-30 05:35:29','2017-03-30 05:35:29','Pacnet','Pacnet',1,1,10000,0,NULL,0,0),(38,'2017-03-30 05:35:29','2017-03-30 05:35:29','PaymentSense','PaymentSense',1,2,10000,0,NULL,0,0),(39,'2017-03-30 05:35:29','2017-03-30 05:35:29','Realex','Realex_Remote',1,1,10000,0,NULL,0,0),(40,'2017-03-30 05:35:29','2017-03-30 05:35:29','Sisow','Sisow',1,1,10000,0,NULL,0,0),(41,'2017-03-30 05:35:29','2017-03-30 05:35:29','Skrill','Skrill',1,1,10000,0,NULL,1,0),(42,'2017-03-30 05:35:29','2017-03-30 05:35:29','BitPay','BitPay',1,1,6,0,NULL,1,0),(43,'2017-03-30 05:35:29','2017-03-30 05:35:29','Dwolla','Dwolla',1,1,5,0,NULL,1,0),(44,'2017-03-30 05:35:29','2017-03-30 05:35:29','AGMS','Agms',1,1,10000,0,NULL,0,0),(45,'2017-03-30 05:35:29','2017-03-30 05:35:29','Barclays','BarclaysEpdq\\Essential',1,1,10000,0,NULL,0,0),(46,'2017-03-30 05:35:29','2017-03-30 05:35:29','Cardgate','Cardgate',1,1,10000,0,NULL,0,0),(47,'2017-03-30 05:35:29','2017-03-30 05:35:29','Checkout.com','CheckoutCom',1,1,10000,0,NULL,0,0),(48,'2017-03-30 05:35:29','2017-03-30 05:35:29','Creditcall','Creditcall',1,1,10000,0,NULL,0,0),(49,'2017-03-30 05:35:29','2017-03-30 05:35:29','Cybersource','Cybersource',1,1,10000,0,NULL,0,0),(50,'2017-03-30 05:35:29','2017-03-30 05:35:29','ecoPayz','Ecopayz',1,1,10000,0,NULL,0,0),(51,'2017-03-30 05:35:29','2017-03-30 05:35:29','Fasapay','Fasapay',1,1,10000,0,NULL,0,0),(52,'2017-03-30 05:35:29','2017-03-30 05:35:29','Komoju','Komoju',1,1,10000,0,NULL,0,0),(53,'2017-03-30 05:35:29','2017-03-30 05:35:29','Multicards','Multicards',1,1,10000,0,NULL,0,0),(54,'2017-03-30 05:35:29','2017-03-30 05:35:29','Pagar.Me','Pagarme',1,2,10000,0,NULL,0,0),(55,'2017-03-30 05:35:29','2017-03-30 05:35:29','Paysafecard','Paysafecard',1,1,10000,0,NULL,0,0),(56,'2017-03-30 05:35:29','2017-03-30 05:35:29','Paytrace','Paytrace_CreditCard',1,1,10000,0,NULL,0,0),(57,'2017-03-30 05:35:29','2017-03-30 05:35:29','Secure Trading','SecureTrading',1,1,10000,0,NULL,0,0),(58,'2017-03-30 05:35:29','2017-03-30 05:35:29','SecPay','SecPay',1,1,10000,0,NULL,0,0),(59,'2017-03-30 05:35:29','2017-03-30 05:35:29','WeChat Express','WeChat_Express',1,2,10000,0,NULL,0,0),(60,'2017-03-30 05:35:29','2017-03-30 05:35:29','WePay','WePay',1,1,10000,0,NULL,0,0),(61,'2017-03-30 05:35:29','2017-03-30 05:35:29','Braintree','Braintree',1,1,2,0,NULL,0,0),(62,'2017-03-30 05:35:29','2017-03-30 05:35:29','Custom','Custom',1,1,8,0,NULL,1,0);
 /*!40000 ALTER TABLE `gateways` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1565,7 +1566,7 @@ CREATE TABLE `payment_libraries` (
 
 LOCK TABLES `payment_libraries` WRITE;
 /*!40000 ALTER TABLE `payment_libraries` DISABLE KEYS */;
-INSERT INTO `payment_libraries` VALUES (1,'2017-03-29 15:28:12','2017-03-29 15:28:12','Omnipay',1),(2,'2017-03-29 15:28:12','2017-03-29 15:28:12','PHP-Payments [Deprecated]',1);
+INSERT INTO `payment_libraries` VALUES (1,'2017-03-30 05:35:28','2017-03-30 05:35:28','Omnipay',1),(2,'2017-03-30 05:35:28','2017-03-30 05:35:28','PHP-Payments [Deprecated]',1);
 /*!40000 ALTER TABLE `payment_libraries` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1675,7 +1676,7 @@ CREATE TABLE `payment_terms` (
 
 LOCK TABLES `payment_terms` WRITE;
 /*!40000 ALTER TABLE `payment_terms` DISABLE KEYS */;
-INSERT INTO `payment_terms` VALUES (1,7,'Net 7','2017-03-29 15:28:12','2017-03-29 15:28:12',NULL,0,0,1),(2,10,'Net 10','2017-03-29 15:28:12','2017-03-29 15:28:12',NULL,0,0,2),(3,14,'Net 14','2017-03-29 15:28:12','2017-03-29 15:28:12',NULL,0,0,3),(4,15,'Net 15','2017-03-29 15:28:12','2017-03-29 15:28:12',NULL,0,0,4),(5,30,'Net 30','2017-03-29 15:28:12','2017-03-29 15:28:12',NULL,0,0,5),(6,60,'Net 60','2017-03-29 15:28:12','2017-03-29 15:28:12',NULL,0,0,6),(7,90,'Net 90','2017-03-29 15:28:12','2017-03-29 15:28:12',NULL,0,0,7),(8,-1,'Net 0','2017-03-29 15:28:15','2017-03-29 15:28:15',NULL,0,0,0);
+INSERT INTO `payment_terms` VALUES (1,7,'Net 7','2017-03-30 05:35:28','2017-03-30 05:35:28',NULL,0,0,1),(2,10,'Net 10','2017-03-30 05:35:28','2017-03-30 05:35:28',NULL,0,0,2),(3,14,'Net 14','2017-03-30 05:35:28','2017-03-30 05:35:28',NULL,0,0,3),(4,15,'Net 15','2017-03-30 05:35:28','2017-03-30 05:35:28',NULL,0,0,4),(5,30,'Net 30','2017-03-30 05:35:28','2017-03-30 05:35:28',NULL,0,0,5),(6,60,'Net 60','2017-03-30 05:35:28','2017-03-30 05:35:28',NULL,0,0,6),(7,90,'Net 90','2017-03-30 05:35:28','2017-03-30 05:35:28',NULL,0,0,7),(8,-1,'Net 0','2017-03-30 05:35:31','2017-03-30 05:35:31',NULL,0,0,0);
 /*!40000 ALTER TABLE `payment_terms` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2270,4 +2271,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2017-03-29 21:28:15
+-- Dump completed on 2017-03-30 11:35:31
diff --git a/resources/views/credits/edit.blade.php b/resources/views/credits/edit.blade.php
index a66998f30566..cb8eaf5b156b 100644
--- a/resources/views/credits/edit.blade.php
+++ b/resources/views/credits/edit.blade.php
@@ -37,7 +37,9 @@
                         ->data_date_format(Session::get(SESSION_DATE_PICKER_FORMAT, DEFAULT_DATE_PICKER_FORMAT))
                         ->addGroupClass('credit_date')
                         ->append('<i class="glyphicon glyphicon-calendar"></i>') !!}
-			{!! Former::textarea('private_notes') !!}
+
+			{!! Former::textarea('public_notes')->rows(4) !!}
+			{!! Former::textarea('private_notes')->rows(4) !!}
 
             </div>
             </div>
diff --git a/resources/views/export/credits.blade.php b/resources/views/export/credits.blade.php
index 4ed9a7b5f693..af21ddcd6110 100644
--- a/resources/views/export/credits.blade.php
+++ b/resources/views/export/credits.blade.php
@@ -6,6 +6,8 @@
     <td>{{ trans('texts.amount') }}</td>
     <td>{{ trans('texts.balance') }}</td>
     <td>{{ trans('texts.credit_date') }}</td>
+    <td>{{ trans('texts.public_notes') }}</td>
+    <td>{{ trans('texts.private_notes') }}</td>
 </tr>
 
 @foreach ($credits as $credit)
@@ -18,6 +20,8 @@
             <td>{{ $account->formatMoney($credit->amount, $credit->client) }}</td>
             <td>{{ $account->formatMoney($credit->balance, $credit->client) }}</td>
             <td>{{ $credit->present()->credit_date }}</td>
+            <td>{{ $credit->public_notes }}</td>
+            <td>{{ $credit->private_notes }}</td>
         </tr>
     @endif
 @endforeach