diff --git a/apimail/api/serializers.py b/apimail/api/serializers.py
index c3c7a9cba87d2b96bc928b3ab0eae394459fbeab..115a3dc096bae8754dc4a510ecbe5e1102141ac8 100644
--- a/apimail/api/serializers.py
+++ b/apimail/api/serializers.py
@@ -118,7 +118,7 @@ class UserTagSerializer(serializers.ModelSerializer):
         fields = ['pk', 'user', 'label', 'unicode_symbol', 'variant']
 
     def get_queryset(self):
-        user = self.request.user
+        user = self.context['request'].user
         return UserTag.objects.filter(user=user)
 
 
@@ -126,11 +126,17 @@ class StoredMessageSerializer(serializers.ModelSerializer):
     attachment_files = AttachmentFileSerializer(many=True)
     event_set = EventSerializer(many=True)
     read = serializers.SerializerMethodField()
-    tags = UserTagSerializer(many=True)
+    tags = serializers.SerializerMethodField()
 
     def get_read(self, obj):
         return self.context['request'].user in obj.read_by.all()
 
+    def get_tags(self, obj):
+        return UserTagSerializer(
+            obj.tags.filter(user=self.context['request'].user),
+            many=True
+        ).data
+
     class Meta:
         model = StoredMessage
         fields = ['uuid', 'data', 'datetimestamp', 'attachment_files', 'event_set', 'read', 'tags']