fix remaining bugs

js/background.js

@@ -131,8 +131,7 @@ define(function(require) {
 							// reload if current selected folder has changed
 							if (require('state').currentAccountId === f.accountId &&
 								require('state').currentFolderId === f.id) {
-								require(
-									'ui').messageView.collection.add(
+								Radio.ui.request('messagesview:collection').add(
 									f.messages);
 							}
 

js/communication.js

@@ -13,6 +13,7 @@ define(function(require) {
 
 	var $ = require('jquery');
 	var OC = require('OC');
+	var Radio = require('radio');
 
 	var messageListXhr = null;
 
@@ -149,7 +150,7 @@ define(function(require) {
 			success: function(data) {
 				if (!_.isNull(options.messageId)) {
 					// Reply -> flag message as replied
-					require('ui').messageView.setMessageFlag(options.messageId, 'answered', true);
+					Radio.ui.trigger('messagesview:messageflag:set', options.messageId, 'answered', true);
 				}
 
 				options.success(data);
@@ -227,10 +228,11 @@ define(function(require) {
 				success: function(data) {
 					if (options.draftUID !== null) {
 						// update UID in message list
-						var message = require('ui').messageView.collection.findWhere({id: options.draftUID});
+						var collection = Radio.ui.request('messagesview:collection');
+						var message = collection.findWhere({id: options.draftUID});
 						if (message) {
 							message.set({id: data.uid});
-							require('ui').messageView.collection.set([message], {remove: false});
+							collection.set([message], {remove: false});
 						}
 					}
 					options.success(data);

js/init.js

@@ -17,12 +17,14 @@ define(function(require) {
 	var OC = require('OC');
 	var Marionette = require('marionette');
 	var Handlebars = require('handlebars');
+	var Mail = require('app');
 
 	setUpMarionette();
 	registerProtocolHandler();
 	requestNotificationPermissions();
 	setUpSearch();
 
+	Mail.start();
 	require('ui').initializeInterface();
 
 	function setUpMarionette() {

js/search.js

@@ -11,12 +11,13 @@
 define(function(require) {
 	'use strict';
 
+	var Radio = require('radio');
 	var timeoutID = null;
 
 	function filter(query) {
 		window.clearTimeout(timeoutID);
 		timeoutID = window.setTimeout(function() {
-			require('ui').messageView.filterCurrentMailbox(query);
+			Radio.ui.trigger('messagesview:filter', query);
 		}, 500);
 		$('#searchresults').hide();
 	}

js/views/composer.js

@@ -15,6 +15,7 @@ define(function(require) {
 	var Handlebars = require('handlebars');
 	var $ = require('jquery');
 	var OC = require('OC');
+	var Radio = require('radio');
 	var Attachments = require('models/attachments');
 	var AttachmentsView = require('views/attachments');
 	var ComposerTemplate = require('text!templates/composer.html');
@@ -302,8 +303,8 @@ define(function(require) {
 					_this.attachments.reset();
 					if (_this.draftUID !== null) {
 						// the sent message was a draft
-						if (!_.isUndefined(require('ui').messageView)) {
-							require('ui').messageView.collection.remove({id: _this.draftUID});
+						if (!_.isUndefined(Radio.ui.request('messagesview:collection'))) {
+							Radio.ui.request('messagesview:collection').remove({id: _this.draftUID});
 						}
 						_this.draftUID = null;
 					}
@@ -414,7 +415,7 @@ define(function(require) {
 				}).autocomplete({
 					source: function(request, response) {
 						$.getJSON(
-							OC.generateUrl('/apps/mail/accounts/autoComplete'),
+							OC.generateUrl('/apps/mail/autoComplete'),
 							{
 								term: extractLast(request.term)
 							}, response);

js/views/messages.js

@@ -35,10 +35,15 @@ define(function(require) {
 			this.collection = new MessageCollection();
 			this.collection.on('change:flags', this.changeFlags, this);
 
+			var _this = this;
+			Radio.ui.reply('messagesview:collection', function() {
+				return _this.collection;
+			});
 			this.listenTo(Radio.ui, 'messagesview:messages:update', this.loadNew);
 			this.listenTo(Radio.ui, 'messagesview:messages:reset', this.reset);
-			this.listenTo(Radio.ui, 'messagesview:messages:add', this.addMessage);
+			this.listenTo(Radio.ui, 'messagesview:messages:add', this.addMessages);
 			this.listenTo(Radio.ui, 'messagesview:messageflag:set', this.setMessageFlag);
+			this.listenTo(Radio.ui, 'messagesview:filter', this.filterCurrentMailbox);
 			this.listenTo(Radio.ui, 'messagesview:filter:clear', this.clearFilter);
 			this.listenTo(Radio.ui, 'messagesview:message:setactive', this.setActiveMessage);
 		},
@@ -172,7 +177,7 @@ define(function(require) {
 					}
 				});
 		},
-		addMessage: function(data) {
+		addMessages: function(data) {
 			this.collection.add(data);
 		},
 		reset: function() {