diff --git a/lib/WebGUI/Workflow/Activity/GetCsMail.pm b/lib/WebGUI/Workflow/Activity/GetCsMail.pm
index be312255f..4b1a6bb6d 100644
--- a/lib/WebGUI/Workflow/Activity/GetCsMail.pm
+++ b/lib/WebGUI/Workflow/Activity/GetCsMail.pm
@@ -173,6 +173,7 @@ sub execute {
 		});
 	return $self->COMPLETE unless (defined $mail);
 	my $i18n = WebGUI::International->new($self->session, "Asset_Collaboration");
+	my $msgnum = 1;
 	while (my $message = $mail->getNextMessage) {
 		next unless (scalar(@{$message->{parts}})); # no content, skip it
 		my $from = $message->{from};
@@ -180,16 +181,18 @@ sub execute {
 		$from = $1 || $from;
 		$from =~ /(\S+\@\S+)/;	
 		my $user = WebGUI::User->newByEmail($self->session, $from);
-		unless (defined $user) {
-			my $send = WebGUI::Mail::Send->create($self->session, {
-				to=>$message->{from},
-				inReplyTo=>$message->{messageId},
-				subject=>$cs->get("mailPrefix").$i18n->get("rejected")." ".$self->{subject},
-				from=>$cs->get("mailAddress")
-				});
-			$send->addText($i18n->get("rejected because no user account"));
-			$send->send;
-			next;
+		if ($cs->get("requireSubscriptionForEmailPosting")) { #don't reject if subscription isn't required
+			unless (defined $user ) {			# if subscription is required, chuck the message if there's no user
+				my $send = WebGUI::Mail::Send->create($self->session, {
+					to=>$message->{from},
+					inReplyTo=>$message->{messageId},
+					subject=>$cs->get("mailPrefix").$i18n->get("rejected")." ".$self->{subject},
+					from=>$cs->get("mailAddress")
+					});
+				$send->addText($i18n->get("rejected because no user account"));
+				$send->send;
+				next;
+			}
 		}
 		my $post = undef;
 		if ($message->{inReplyTo}) {
@@ -197,7 +200,12 @@ sub execute {
 			my $id = $1;	
 			$post = WebGUI::Asset->newByDynamicClass($self->session, $id);
 		}
-		if (defined $post && $cs->get("allowReplies") && $user->isInGroup($cs->get("postGroupId")) && (!$cs->get("requireSubscriptionForEmailPosting") || $user->isInGroup($cs->get("subscriptionGroupId")) || $user->isInGroup($post->get("subscriptionGroupId")))) {
+		if (!$cs->get("requireSubscriptionForEmailPosting") && !(defined $user)) { #this one is for unregistered posters
+			$user = WebGUI::User->new($self->session, undef);
+			$self->addPost($cs, $message, $user, $cs->get("mailPrefix"));
+			
+
+		} elsif (defined $post && $cs->get("allowReplies") && $user->isInGroup($cs->get("postGroupId")) && (!$cs->get("requireSubscriptionForEmailPosting") || $user->isInGroup($cs->get("subscriptionGroupId")) || $user->isInGroup($post->get("subscriptionGroupId")))) {
 			$self->addPost($post, $message, $user, $cs->get("mailPrefix"));
 			if ($cs->get("autoSubscribeToThread") && !($user->isInGroup($cs->get("subscriptionGroupId")) || $user->isInGroup($post->get("subscriptionGroupId")))) {
 				$user->addToGroups([$post->getThread->get("subscriptionGroupId")]);
@@ -218,6 +226,7 @@ sub execute {
 			$send->send;
 		}
 		# just in case there are a lot of messages, we should release after a minutes worth of retrieving
+		$msgnum ++;
 		last if (time() > $start + 60);
 	}
 	$mail->disconnect;