Enhancement: #1430 (4)

http://eden.sahanafoundation.org/ticket/1430 Item number 4.