Thold 0.5 alert messages and aggregated graphs

[GLR]

We are using a lot of graphs aggregating data sources from several hosts in our Cacti installations.
Whereas the threshold edition page is now fixed in 0.5 and thus only shows the right datasource and graph, we are still getting wrong graphs (aggregated ones instead of the original ones) in some alert email messages.
How can we avoid this ? Can this be fixed as well ?