diff --git a/mozilla/mail/locales/en-US/chrome/messenger/am-copies.dtd b/mozilla/mail/locales/en-US/chrome/messenger/am-copies.dtd
index bd6657031c7..29b8356e344 100644
--- a/mozilla/mail/locales/en-US/chrome/messenger/am-copies.dtd
+++ b/mozilla/mail/locales/en-US/chrome/messenger/am-copies.dtd
@@ -4,6 +4,8 @@
 <!ENTITY sendingPrefix.label "When sending messages, automatically: ">
 <!ENTITY fccMailFolder.label "Place a copy in:">
 <!ENTITY fccMailFolder.accesskey "P">
+<!ENTITY fccReplyFollowsParent.label "Place replies in the folder of the message being replied to">
+<!ENTITY fccReplyFollowsParent.accesskey "l">
 <!ENTITY chooseFolderButton.label "Choose Folder...">
 <!-- LOCALIZATION NOTE (bccAddress.label): do not translate "Bcc" in below line -->
 <!ENTITY bccAddress.label "Bcc these email addresses:">
diff --git a/mozilla/mailnews/base/prefs/resources/content/am-copies.js b/mozilla/mailnews/base/prefs/resources/content/am-copies.js
index 174737a6e3c..0daedb058ca 100644
--- a/mozilla/mailnews/base/prefs/resources/content/am-copies.js
+++ b/mozilla/mailnews/base/prefs/resources/content/am-copies.js
@@ -53,6 +53,12 @@ var draftsFolderPickerId = "msgDraftsFolderPicker";
 var tmplAccountPickerId = "msgStationeryAccountPicker";
 var tmplFolderPickerId = "msgStationeryFolderPicker";
 
+function onPreInit(account, accountValues)
+{
+  var type = parent.getAccountValue(account, accountValues, "server", "type", null, false);
+  hideShowControls(type);
+}
+
 /* 
  * Set the global radio element choices and initialize folder/account pickers. 
  * Also, initialize other UI elements (bcc self, fcc picker controller checkboxes).