diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 0213a6545..dbbb0bd51 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -29,7 +29,7 @@
  - fixed: Page Layout templates generate invalid HTML with description
  - fixed: Form/Integer now shows 0 in the results page
  - added: Email from field now prefixed with username
-
+ - added: Inbox messages now tell you who the message was from
 7.5.22
  - fixed: Layout template now gets prepared correctly
  - fixed: When user does not have permissions to search/edit a thing a proper error is shown.
diff --git a/lib/WebGUI/Inbox/Message.pm b/lib/WebGUI/Inbox/Message.pm
index 1d0b5573d..633171940 100644
--- a/lib/WebGUI/Inbox/Message.pm
+++ b/lib/WebGUI/Inbox/Message.pm
@@ -16,7 +16,7 @@ package WebGUI::Inbox::Message;
 
 use strict;
 use WebGUI::Mail::Send;
-
+use WebGUI::International;
 =head1 NAME
 
 Package WebGUI::Inbox::Message;
@@ -112,12 +112,14 @@ sub create {
 		subject=>$subject,
 		});
 	if (defined $mail) {
+        my $i18n = WebGUI::International->new($session, 'Inbox_Message');
+        my $pref = $i18n->get("from user preface");
+        $pref .= $session->db->quickScalar("SELECT username FROM users WHERE userid = ?",[$properties->{sentBy}]). ".";
 	    my $msg = (defined $properties->{emailMessage}) ? $properties->{emailMessage} : $self->{_properties}{message};
-	       
 		if ($msg =~ m/\<.*\>/) {
-			$mail->addHtml($msg);
+			$mail->addHtml("<p>$pref</p><br>".$msg);
 		} else {
-			$mail->addText($msg);
+			$mail->addText($pref."\n\n".$msg);
 		}
 		$mail->addFooter;
 		$mail->queue;
diff --git a/lib/WebGUI/i18n/English/Inbox_Message.pm b/lib/WebGUI/i18n/English/Inbox_Message.pm
new file mode 100644
index 000000000..b953fe5e8
--- /dev/null
+++ b/lib/WebGUI/i18n/English/Inbox_Message.pm
@@ -0,0 +1,12 @@
+package WebGUI::i18n::English::Inbox_Message;
+use strict;
+
+our $I18N = {
+
+	'from user preface' => {
+		message => q|You were sent a message from |,
+		lastUpdated => 0
+	},
+};
+
+1;