diff --git a/lib/WebGUI/Account/Inbox.pm b/lib/WebGUI/Account/Inbox.pm
index 57d6b5af1..8f61620b6 100644
--- a/lib/WebGUI/Account/Inbox.pm
+++ b/lib/WebGUI/Account/Inbox.pm
@@ -223,7 +223,13 @@ sub editSettingsForm {
         label       => $i18n->get("inbox rich editor label"),
         hoverHelp   => $i18n->get("inbox rich editor description"),
     );
-    
+    $f->yesNo(
+		name      => "inboxCopySender",
+		value     => $setting->get("inboxCopySender"),
+		label     => $i18n->get("inbox copy sender label"),
+        hoverHelp => $i18n->get("inbox copy sender hoverHelp")
+	);
+
     return $f->printRowsOnly;
 }
 
@@ -242,28 +248,29 @@ sub editSettingsFormSave {
     my $form    = $session->form;
 
     #Messages Settings
-    $setting->set("inboxStyleTemplateId", $form->process("inboxStyleTemplateId","template"));
-    $setting->set("inboxLayoutTemplateId", $form->process("inboxLayoutTemplateId","template"));
-    $setting->set("inboxViewTemplateId", $form->process("inboxViewTemplateId","template"));
-    $setting->set("inboxViewMessageTemplateId",$form->process("inboxViewMessageTemplateId","template"));
-    $setting->set("inboxSendMessageTemplateId",$form->process("inboxSendMessageTemplateId","template"));
+    $setting->set("inboxStyleTemplateId",              $form->process("inboxStyleTemplateId",              "template"));
+    $setting->set("inboxLayoutTemplateId",             $form->process("inboxLayoutTemplateId",             "template"));
+    $setting->set("inboxViewTemplateId",               $form->process("inboxViewTemplateId",               "template"));
+    $setting->set("inboxViewMessageTemplateId",        $form->process("inboxViewMessageTemplateId",        "template"));
+    $setting->set("inboxSendMessageTemplateId",        $form->process("inboxSendMessageTemplateId",        "template"));
     $setting->set("inboxMessageConfirmationTemplateId",$form->process("inboxMessageConfirmationTemplateId","template"));
-    $setting->set("inboxErrorTemplateId",$form->process("inboxErrorTemplateId","template"));
+    $setting->set("inboxErrorTemplateId",              $form->process("inboxErrorTemplateId",              "template"));
     #Friends Invitations Settings
-    $setting->set("inboxManageInvitationsTemplateId",$form->process("inboxManageInvitationsTemplateId","template"));
-    $setting->set("inboxViewInvitationTemplateId",$form->process("inboxViewInvitationTemplateId","template"));
-    $setting->set("inboxInvitationConfirmTemplateId",$form->process("inboxInvitationConfirmTemplateId","template"));
+    $setting->set("inboxManageInvitationsTemplateId",  $form->process("inboxManageInvitationsTemplateId",  "template"));
+    $setting->set("inboxViewInvitationTemplateId",     $form->process("inboxViewInvitationTemplateId",     "template"));
+    $setting->set("inboxInvitationConfirmTemplateId",  $form->process("inboxInvitationConfirmTemplateId",  "template"));
     #User Invitation Settings
-    $setting->set("inboxInviteUserEnabled",$form->process("inboxInviteUserEnabled","yesNo"));
-    $setting->set("inboxInviteUserRestrictSubject",$form->process("inboxInviteUserRestrictSubject","yesNo"));
-    $setting->set("inboxInviteUserSubject",$form->process("inboxInviteUserSubject","text"));
-    $setting->set("inboxInviteUserRestrictMessage",$form->process("inboxInviteUserRestrictMessage","yesNo"));
-    $setting->set("inboxInviteUserMessage",$form->process("inboxInviteUserMessage","HTMLArea"));    
-    $setting->set("inboxInviteUserMessageTemplateId",$form->process("inboxInviteUserMessageTemplateId","template"));
-    $setting->set("inboxInviteUserTemplateId",$form->process("inboxInviteUserTemplateId","template"));
-    $setting->set("inboxInviteUserConfirmTemplateId",$form->process("inboxInviteUserConfirmTemplateId","template"));
-
-    $setting->set("inboxRichEditorId", $form->process("inboxRichEditorId", "selectRichEditor") );
+    $setting->set("inboxInviteUserEnabled",            $form->process("inboxInviteUserEnabled",            "yesNo"));
+    $setting->set("inboxInviteUserRestrictSubject",    $form->process("inboxInviteUserRestrictSubject",    "yesNo"));
+    $setting->set("inboxInviteUserSubject",            $form->process("inboxInviteUserSubject",            "text"));
+    $setting->set("inboxInviteUserRestrictMessage",    $form->process("inboxInviteUserRestrictMessage",    "yesNo"));
+    $setting->set("inboxInviteUserMessage",            $form->process("inboxInviteUserMessage",            "HTMLArea"));    
+    $setting->set("inboxInviteUserMessageTemplateId",  $form->process("inboxInviteUserMessageTemplateId",  "template"));
+    $setting->set("inboxInviteUserTemplateId",         $form->process("inboxInviteUserTemplateId",         "template"));
+    $setting->set("inboxInviteUserConfirmTemplateId",  $form->process("inboxInviteUserConfirmTemplateId",  "template"));
+    #General Inbox Settings
+    $setting->set("inboxRichEditorId",                 $form->process("inboxRichEditorId",                 "selectRichEditor") );
+    $setting->set("inboxCopySender",                   $form->process("inboxCopySender",                   "yesNo"));
 }
 
 
@@ -913,8 +920,9 @@ sub www_sendMessage {
     #Add any error passed in to be displayed if the form reloads
     $var->{'message_display_error'}  = $displayError;
 
-    #Add common template variable for displaying the inbox
     my $inbox     = WebGUI::Inbox->new($session); 
+
+    #Add common template variable for displaying the inbox
     $self->appendCommonVars($var,$inbox);
     
     my $messageId = $form->get("messageId");
@@ -1131,6 +1139,10 @@ sub www_sendMessageSave {
         }
     }
 
+    if($session->setting->get('inboxCopySender')) {
+        push @toUsers, $session->user->userId;
+    }
+
     #Check for client errors
     if($subject eq "") {
         my $i18n  = WebGUI::International->new($session,'Account_Inbox');
diff --git a/lib/WebGUI/i18n/English/Account_Inbox.pm b/lib/WebGUI/i18n/English/Account_Inbox.pm
index 142cafaeb..343f317b4 100644
--- a/lib/WebGUI/i18n/English/Account_Inbox.pm
+++ b/lib/WebGUI/i18n/English/Account_Inbox.pm
@@ -721,6 +721,17 @@ our $I18N = {
          context      => "template variable for view inbox template",
      },
 
+    'inbox copy sender label' => {
+        message     => q|Copy Sender on Messages?|,
+        context     => q|Copy, as in receive a copy.  Label for Account/Inbox settings|,
+        lastUpdated => 0,
+    },
+
+    'inbox copy sender hoverHelp' => {
+        message     => q|If this setting is 'yes', users will receive a copy of messages that they send using the inbox.|,
+        lastUpdated => 0,
+    },
+
 };
 
 1;