diff --git a/j-lawyer-client/src/com/jdimension/jlawyer/client/mail/ViewEmailDialog.java b/j-lawyer-client/src/com/jdimension/jlawyer/client/mail/ViewEmailDialog.java
index 1c2eee02e..0a752f1af 100755
--- a/j-lawyer-client/src/com/jdimension/jlawyer/client/mail/ViewEmailDialog.java
+++ b/j-lawyer-client/src/com/jdimension/jlawyer/client/mail/ViewEmailDialog.java
@@ -838,6 +838,7 @@ private void cmdReplyActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRS
             dlg = EmailUtils.reply(this.outlookMsg, this.content.getBody(), this.content.getContentType());
         }
         dlg.setArchiveFile(this.contextArchiveFile, this.contextFolder);
+        this.setPartiesToSendDialog(dlg);
         FrameUtils.centerDialog(dlg, null);
         dlg.setVisible(true);
 
@@ -851,6 +852,7 @@ private void cmdReplyActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRS
     private void cmdReplyAllActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cmdReplyAllActionPerformed
         SendEmailDialog dlg = new SendEmailDialog(true, EditorsRegistry.getInstance().getMainWindow(), false);
         dlg.setArchiveFile(this.contextArchiveFile, this.contextFolder);
+        this.setPartiesToSendDialog(dlg);
 
         if (this.emlMsg != null) {
             MessageContainer msgC = this.emlMsg;
@@ -951,9 +953,7 @@ private void cmdReplyAllActionPerformed(java.awt.event.ActionEvent evt) {//GEN-F
 
     }//GEN-LAST:event_cmdReplyAllActionPerformed
 
-    private void cmdForwardActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cmdForwardActionPerformed
-        SendEmailDialog dlg = new SendEmailDialog(true, EditorsRegistry.getInstance().getMainWindow(), false);
-        dlg.setArchiveFile(this.contextArchiveFile, this.contextFolder);
+    private void setPartiesToSendDialog(SendEmailDialog dlg) {
         if (this.contextArchiveFile != null) {
             try {
                 ClientSettings settings = ClientSettings.getInstance();
@@ -967,6 +967,12 @@ private void cmdForwardActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FI
                 log.error("Unable to add recipient candidates", t);
             }
         }
+    }
+    
+    private void cmdForwardActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cmdForwardActionPerformed
+        SendEmailDialog dlg = new SendEmailDialog(true, EditorsRegistry.getInstance().getMainWindow(), false);
+        dlg.setArchiveFile(this.contextArchiveFile, this.contextFolder);
+        this.setPartiesToSendDialog(dlg);
 
         if (this.emlMsg != null) {
             MessageContainer msgC = this.emlMsg;