diff --git a/addons/account_followup/__openerp__.py b/addons/account_followup/__openerp__.py
index dddb5749525..fc2f17e6a97 100644
--- a/addons/account_followup/__openerp__.py
+++ b/addons/account_followup/__openerp__.py
@@ -52,7 +52,6 @@ Note that if you want to check the follow-up level for a given partner/account e
         'security/ir.model.access.csv',
         'report/account_followup_report.xml',
         'account_followup_data.xml',
-        
         'account_followup_view.xml',
         'account_followup_customers.xml',
         'wizard/account_followup_print_view.xml',
diff --git a/addons/account_followup/account_followup.py b/addons/account_followup/account_followup.py
index ac263c41c86..13c903605e8 100644
--- a/addons/account_followup/account_followup.py
+++ b/addons/account_followup/account_followup.py
@@ -317,7 +317,7 @@ class res_partner(osv.osv):
         'payment_next_action':fields.text('Next Action',
                                     help="This is the next action to be taken by the user.  It will automatically be set when the action fields are empty and the partner gets a follow-up level that requires a manual action. "), 
         'payment_next_action_date':fields.date('Next Action Date',
-                                    help="This is when further follow-up is needed.  The date will have been set to the current date if the action fields are empty and the partner gets a follow-up level that requires a manual action. "), # next action date
+                                    help="This is when further follow-up is needed.  The date will have been set to the current date if the action fields are empty and the partner gets a follow-up level that requires a manual action. "), 
         'unreconciled_aml_ids':fields.one2many('account.move.line', 'partner_id', domain=['&', ('reconcile_id', '=', False), '&', 
                             ('account_id.active','=', True), '&', ('account_id.type', '=', 'receivable'), ('state', '!=', 'draft')]), 
         'latest_followup_date':fields.function(_get_latest, method=True, type='date', string="Latest Follow-up Date", 
@@ -337,7 +337,7 @@ class res_partner(osv.osv):
         'next_followup_level_id':fields.function(_get_next_followup_level_id, method=True, type='many2one', relation='account_followup.followup.line', 
                                         string="Next Level", help="The next follow-up level to come when the customer still refuses to pay",   
                                         store=False),
-        'payment_amount_due':fields.related('credit', type='float', string="Total amount due"), 
+        'payment_amount_due':fields.related('credit', type='float', string="Total amount due", readonly=True),
         }
 
 res_partner()
diff --git a/addons/account_followup/account_followup_customers.xml b/addons/account_followup/account_followup_customers.xml
index 1a30fac996e..0469f2cd09e 100644
--- a/addons/account_followup/account_followup_customers.xml
+++ b/addons/account_followup/account_followup_customers.xml
@@ -31,6 +31,7 @@
                         <filter string="Partners with Credits" domain="[('credit', '>', 0.0)]" name="credits"/>
                         <separator/>
                         <filter string="Follow-ups To Do" domain="[('payment_next_action_date', '&lt;=', time.strftime('%%Y-%%m-%%d')), ('credit', '>', 0.0)]" name="todo"/>
+                        <filter string="Future Follow-ups" domain="[('payment_next_action_date', '&gt;', time.strftime('%%Y-%%m-%%d')), ('credit', '>', 0.0)]"/>
                         <separator/>
                         <filter string="No Responsible" domain="[('payment_responsible_id', '=', False)]"/>
                         <filter string="My Follow-ups" domain="[('payment_responsible_id','=', uid)]"/>
diff --git a/addons/account_followup/account_followup_data.xml b/addons/account_followup/account_followup_data.xml
index d8d26fbdcc9..a23158649ee 100644
--- a/addons/account_followup/account_followup_data.xml
+++ b/addons/account_followup/account_followup_data.xml
@@ -11,7 +11,7 @@
 		 <record id="email_template_account_followup_level0" model="email.template">
             <field name="name">Follow-up of overdue invoices level 0</field>
             <field name="email_from">${user.email or ''}</field>
-            <field name="subject">${object.company_id.name} Payments Follow-up</field>
+            <field name="subject">${object.company_id.name} Payment Follow-up</field>
             <field name="email_to">${object.email}</field>
             <field name="lang">${object.lang}</field>
             <field name="model_id" ref="base.model_res_partner"/>
@@ -95,7 +95,7 @@ ${mel[aml.id]}
 		 <record id="email_template_account_followup_level1" model="email.template">
             <field name="name">Follow-up of overdue invoices level 1</field>
             <field name="email_from">${user.email or ''}</field>
-            <field name="subject">${object.company_id.name} Payments Follow-up</field>
+            <field name="subject">${object.company_id.name} Payment Follow-up</field>
             <field name="email_to">${object.email}</field>
             <field name="lang">${object.lang}</field>
             <field name="model_id" ref="base.model_res_partner"/>
@@ -180,7 +180,7 @@ ${mel[aml.id]}
         <record id="email_template_account_followup_level2" model="email.template">
             <field name="name">Follow-up of overdue invoices level 2</field>
             <field name="email_from">${user.email or ''}</field>
-            <field name="subject">${object.company_id.name} Payments Follow-up</field>
+            <field name="subject">${object.company_id.name} Payment Follow-up</field>
             <field name="email_to">${object.email}</field>
             <field name="lang">${object.lang}</field>
             <field name="model_id" ref="base.model_res_partner"/>
@@ -265,7 +265,7 @@ ${mel[aml.id]}
 		 <record id="email_template_account_followup_default" model="email.template">
             <field name="name">Default follow-up of overdue invoices</field>
             <field name="email_from">${user.email or ''}</field>
-            <field name="subject">${object.company_id.name} Payments Follow-up</field>
+            <field name="subject">${object.company_id.name} Payment Follow-up</field>
             <field name="email_to">${object.email}</field>
             <field name="lang">${object.lang}</field>
             <field name="model_id" ref="base.model_res_partner"/>
diff --git a/addons/account_followup/account_followup_demo.xml b/addons/account_followup/account_followup_demo.xml
index 88b8b35a5a3..4f22c18857d 100644
--- a/addons/account_followup/account_followup_demo.xml
+++ b/addons/account_followup/account_followup_demo.xml
@@ -2,11 +2,11 @@
 <openerp>
   <data noupdate="1">
         <record id="demo_followup_line4" model="account_followup.followup.line">
-            <field name="name">More agressive reminder email</field>
+            <field name="name">Urging reminder email</field>
             <field name="sequence">4</field>
             <field name="delay">50</field>
             <field name="followup_id" ref="demo_followup1"/>
-            <field name="send_email">True</field>            
+            <field name="send_email">True</field>
             <field name="email_template_id" ref="email_template_account_followup_level2"/>
             <field name="description">
 Dear %(partner_name)s,
@@ -20,10 +20,10 @@ I trust that this action will prove unnecessary and details of due payments is p
 In case of any queries concerning this matter, do not hesitate to contact our accounting department at (+32).10.68.94.39.
 
 Best Regards,
-</field>
+            </field>
         </record>
         <record id="demo_followup_line5" model="account_followup.followup.line">
-            <field name="name">More agressive reminder letter</field>
+            <field name="name">Urging reminder letter</field>
             <field name="sequence">5</field>
             <field name="delay">60</field>
             <field name="followup_id" ref="demo_followup1"/>
@@ -42,10 +42,7 @@ I trust that this action will prove unnecessary and details of due payments is p
 In case of any queries concerning this matter, do not hesitate to contact our accounting department at (+32).10.68.94.39.
 
 Best Regards,
-</field>
+            </field>
         </record>
-       
-         
-
     </data>
 </openerp>