Fixed a little behaviour regarding waiting messages when exporting contents in the demo app.