diff --git a/frontend/apps/widget/src/components/PreChatForm.vue b/frontend/apps/widget/src/components/PreChatForm.vue
index 5b2b35b8..e2b92f91 100644
--- a/frontend/apps/widget/src/components/PreChatForm.vue
+++ b/frontend/apps/widget/src/components/PreChatForm.vue
@@ -179,7 +179,7 @@
             <Textarea
               v-model="messageText"
               :placeholder="$t('globals.terms.typeMessage')"
-              class="w-full min-h-20 max-h-32 resize-none"
+              class="w-full min-h-32 max-h-48 resize-none"
             />
           </div>
         </form>
diff --git a/internal/conversation/conversation.go b/internal/conversation/conversation.go
index 51c3ddef..75b6e9b3 100644
--- a/internal/conversation/conversation.go
+++ b/internal/conversation/conversation.go
@@ -1416,11 +1416,11 @@ func (c *Manager) addConversationParticipant(userID int, conversationUUID string
 		return envelope.NewError(envelope.GeneralError, c.i18n.T("globals.messages.somethingWentWrong"), nil)
 	}
 
-	// New participant added - log activity only for contacts (not agents) who differ from conversation contact.
+	// New participant added - log activity only for contacts with a different email than the conversation contact.
 	conversation, convErr := c.GetConversation(0, conversationUUID, "")
-	if convErr == nil && conversation.ContactID != userID {
+	if convErr == nil {
 		user, userErr := c.userStore.Get(userID, "", []string{})
-		if userErr == nil && user.Type == umodels.UserTypeContact {
+		if userErr == nil && user.Type == umodels.UserTypeContact && !strings.EqualFold(user.Email.String, conversation.Contact.Email.String) {
 			participantName := user.Email.String
 			if user.FirstName != "" {
 				participantName = user.FirstName