BZ1158818 Add "reminder" feature