diff --git a/trans/models.py b/trans/models.py
index 1a56030d4..178b9a853 100644
--- a/trans/models.py
+++ b/trans/models.py
@@ -412,6 +412,10 @@ class Unit(models.Model):
         # Store to backend
         (saved, pounit) = self.translation.update_unit(self, request)
         self.translated = pounit.istranslated()
+        if hasattr(pounit, 'typecomments'):
+            self.flags = ', '.join(pounit.typecomments)
+        else:
+            self.flags = ''
         self.save(backend = True)
         self.translation.update_stats()
         # Propagate to other projects