--- a/pgsql/update_tables_0.5.x-0.6-dovecot-1.2.x.pgsql	Tue Apr 10 00:08:12 2012 +0200
+++ b/pgsql/update_tables_0.5.x-0.6-dovecot-1.2.x.pgsql	Tue Apr 10 00:33:53 2012 +0200
@@ -495,6 +495,15 @@
             LOOP
                 RETURN NEXT record;
             END LOOP;
+        IF NOT FOUND THEN
+            FOR record IN
+                SELECT recipient, destination
+                  FROM catchall
+                 WHERE gid = did
+                LOOP
+                    RETURN NEXT record;
+                END LOOP;
+        END IF;
         RETURN;
     END;
 $$ LANGUAGE plpgsql STABLE