diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml
index 53f2b54e0ef..8f879d6b465 100644
--- a/addons/account/demo/account_minimal.xml
+++ b/addons/account/demo/account_minimal.xml
@@ -122,6 +122,14 @@
             <field name="type">other</field>
             <field name="user_type" ref="data_account_type_income"/>
         </record>
+        <record id="usd_bnk" model="account.account">
+            <field name="code">X11007</field>
+            <field name="name">USD Bank Account - (test)</field>
+            <field ref="cas" name="parent_id"/>
+            <field name="type">liquidity</field>
+            <field name="user_type" ref="data_account_type_asset"/>
+            <field name="currency_id" ref="base.USD"/>
+        </record>
 
         <record model="account.account" id="liabilities_view">
             <field name="name">Liabilities - (test)</field>
@@ -360,8 +368,8 @@
             <field name="type">bank</field>
             <field name="view_id" ref="account_journal_bank_view"/>
             <field name="sequence_id" ref="sequence_bank_journal"/>
-            <field model="account.account" name="default_debit_account_id" ref="cash"/>
-            <field model="account.account" name="default_credit_account_id" ref="cash"/>
+            <field model="account.account" name="default_debit_account_id" ref="bnk"/>
+            <field model="account.account" name="default_credit_account_id" ref="bnk"/>
             <field name="analytic_journal_id" ref="sit"/>
             <field name="user_id" ref="base.user_root"/>
         </record>
@@ -412,6 +420,16 @@
             <field eval="True" name="centralisation"/>
             <field name="user_id" ref="base.user_root"/>
         </record>
+
+        <record id="bank_journal_usd" model="account.journal">
+            <field name="name">USD Bank Journal - (test)</field>
+            <field name="code">TUBK</field>
+            <field name="type">bank</field>
+            <field name="view_id" ref="account_journal_bank_view"/>
+            <field model="account.account" name="usd_debit_account_id" ref="usd_bnk"/>
+            <field model="account.account" name="usd_credit_account_id" ref="usd_bnk"/>
+            <field name="currency_id" ref="base.USD"/>
+        </record>
         <!--
         Product income and expense accounts, default parameters
         -->
diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index dd05d1850fd..1dc79dc634c 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -215,7 +215,10 @@ class email_template(osv.osv):
         if default is None:
             default = {}
         default = default.copy()
-        default.update(name=_("%s (copy)") % (template.name))
+        default.update(
+            name=_("%s (copy)") % (template.name),
+            ref_ir_act_window=False,
+            ref_ir_value=False)
         return super(email_template, self).copy(cr, uid, id, default, context)
 
     def build_expression(self, field_name, sub_field_name, null_value):
diff --git a/addons/l10n_ch/journal_data.xml b/addons/l10n_ch/journal_data.xml
index 04870ca936b..ede9136c3d2 100644
--- a/addons/l10n_ch/journal_data.xml
+++ b/addons/l10n_ch/journal_data.xml
@@ -19,6 +19,7 @@
             <field name="user_id" ref="base.user_root"/>
             <field name="update_posted" eval="True" />
             <field name="entry_posted" eval="True" />
+            <field name="currency" model="res.currency" ref="base.CHF" />
         </record>
         
         <record id="bank_euro_journal" model="account.journal">