diff --git a/addons/account_followup/__terp__.py b/addons/account_followup/__terp__.py
index 00e86ef2d96..5122204fa68 100644
--- a/addons/account_followup/__terp__.py
+++ b/addons/account_followup/__terp__.py
@@ -53,6 +53,7 @@
         'wizard/wizard_view.xml',
         'followup_report_view.xml',
         'followup_view.xml',
+        'followup_data.xml'
     ],
     'demo_xml': ['followup_demo.xml'],
     'installable': True,
diff --git a/addons/account_followup/followup.py b/addons/account_followup/followup.py
index 459e3e38e3c..9efd1d0a1ff 100644
--- a/addons/account_followup/followup.py
+++ b/addons/account_followup/followup.py
@@ -55,6 +55,29 @@ class account_move_line(osv.osv):
     }
 account_move_line()
 
+class res_company(osv.osv):
+    _inherit = "res.company"
+    _columns = {
+        'follow_up_msg' : fields.text('Follow-up Message', translate=True),
+    }
+
+    _defaults = {
+        'overdue_msg': lambda *a: '''
+Date : %(date)s
+
+Dear %(partner_name)s,
+
+Please find in attachment a reminder of all your unpaid invoices, for a total amount due of:
+
+%(followup_amount).2f %(company_currency)s
+
+Thanks,
+--
+%(user_signature)s
+%(company_name)s
+        '''
+    }
+res_company()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/account_followup/followup_view.xml b/addons/account_followup/followup_view.xml
index 1b2d40a7cd9..cd02355dc7e 100644
--- a/addons/account_followup/followup_view.xml
+++ b/addons/account_followup/followup_view.xml
@@ -125,7 +125,6 @@
             </field>
         </record>
         
-        
         <act_window domain="[('partner_id', '=', active_id),('reconcile_id','=',False),('account_id.reconcile', '=', True)]" id="account.act_account_partner_account_move_unreconciled" name="Receivables &amp; Payables" res_model="account.move.line" view="account_move_line_partner_tree"/>
         
         <act_window domain="[('reconcile_id', '=', False),('account_id.type','=','receivable')]" id="act_account_partner_account_move_all" name="All receivable entries" res_model="account.move.line" src_model="" view="account_move_line_partner_tree"/>
@@ -136,6 +135,17 @@
         
         <menuitem action="act_account_partner_account_move_payable_all" id="menu_account_move_open_unreconcile_payable" parent="account_followup.menu_action_followup_stat"/>
         
-        
+        <record model="ir.ui.view" id="view_company_inherit_followup_form">
+			<field name="name">res.company.followup.form.inherit</field>
+			<field name="inherit_id" ref="account.view_company_inherit_form"/>
+			<field name="model">res.company</field>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+            	<field name="overdue_msg" nolabel="1" colspan ="4" position="after">
+            	    <separator string="Follow-up Message" colspan="4"/>
+                    <field name="follow_up_msg" nolabel="1" colspan ="4"/>
+                </field>
+            </field>
+		</record>
     </data>
 </openerp>
diff --git a/addons/account_followup/wizard/wizard_followup_print.py b/addons/account_followup/wizard/wizard_followup_print.py
index e271d1dbd27..9d1f4c6deef 100644
--- a/addons/account_followup/wizard/wizard_followup_print.py
+++ b/addons/account_followup/wizard/wizard_followup_print.py
@@ -256,8 +256,10 @@ class followup_all_print(wizard.interface):
                 if partner_id not in partner_list:
                     partner_list.append(partner_id)
                 to_update[str(id)] = fups[followup_line_id][1]
-
-        return {'partner_ids': partner_list, 'to_update': to_update}
+        
+        message = pool.get('res.users').browse(cr, uid, uid).company_id.follow_up_msg
+        
+        return {'partner_ids': partner_list, 'to_update': to_update, 'email_body':message}
 
     def _get_screen1_values(self, cr, uid, data, context):
         pool = pooler.get_pool(cr.dbname)