Code refactoring:

- Created "controller" and "mail.filter" package
- Moved a lot of classes to new/other packages
- Removed unused classes: NoSuchProviderException, MessageDateComparator

src/com/fsck/k9/Account.java

@@ -7,6 +7,7 @@ import android.net.ConnectivityManager;
 import android.net.Uri;
 import android.util.Log;
 
+import com.fsck.k9.helper.Utility;
 import com.fsck.k9.mail.Address;
 import com.fsck.k9.mail.Folder;
 import com.fsck.k9.mail.MessagingException;

src/com/fsck/k9/K9.java

@@ -14,6 +14,8 @@ import android.util.Log;
 import android.webkit.WebSettings;
 
 import com.fsck.k9.activity.MessageCompose;
+import com.fsck.k9.controller.MessagingController;
+import com.fsck.k9.controller.MessagingListener;
 import com.fsck.k9.mail.Address;
 import com.fsck.k9.mail.Message;
 import com.fsck.k9.mail.MessagingException;

src/com/fsck/k9/activity/Accounts.java

@@ -23,6 +23,8 @@ import com.fsck.k9.*;
 import com.fsck.k9.activity.setup.AccountSettings;
 import com.fsck.k9.activity.setup.AccountSetupBasics;
 import com.fsck.k9.activity.setup.Prefs;
+import com.fsck.k9.controller.MessagingController;
+import com.fsck.k9.controller.MessagingListener;
 import com.fsck.k9.mail.Flag;
 
 import java.util.ArrayList;

src/com/fsck/k9/activity/ActivityListener.java

@@ -6,8 +6,8 @@ import android.content.Context;
 
 import com.fsck.k9.Account;
 import com.fsck.k9.K9;
-import com.fsck.k9.MessagingListener;
 import com.fsck.k9.R;
+import com.fsck.k9.controller.MessagingListener;
 import com.fsck.k9.service.MailService;
 
 public class ActivityListener extends MessagingListener

src/com/fsck/k9/activity/ChooseFolder.java

@@ -12,6 +12,8 @@ import android.widget.ArrayAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
 import com.fsck.k9.*;
+import com.fsck.k9.controller.MessagingController;
+import com.fsck.k9.controller.MessagingListener;
 import com.fsck.k9.mail.Folder;
 import com.fsck.k9.mail.MessagingException;
 import java.util.ArrayList;

src/com/fsck/k9/activity/ChooseIdentity.java

@@ -12,7 +12,6 @@ import android.widget.ListView;
 import android.widget.Toast;
 import com.fsck.k9.Account;
 import com.fsck.k9.Identity;
-import com.fsck.k9.K9ListActivity;
 import com.fsck.k9.Preferences;
 import com.fsck.k9.R;
 import java.util.List;

src/com/fsck/k9/activity/ColorPickerDialog.java

@@ -14,8 +14,10 @@
  * limitations under the License.
  */
 
-package com.fsck.k9;
+package com.fsck.k9.activity;
 
+import com.fsck.k9.R;
+import com.fsck.k9.R.string;
 import android.os.Bundle;
 import android.app.Dialog;
 

src/com/fsck/k9/activity/EditIdentity.java

@@ -9,7 +9,6 @@ import android.widget.EditText;
 import android.widget.LinearLayout;
 import com.fsck.k9.Account;
 import com.fsck.k9.Identity;
-import com.fsck.k9.K9Activity;
 import com.fsck.k9.Preferences;
 import com.fsck.k9.R;
 import java.util.List;

src/com/fsck/k9/activity/FolderList.java

@@ -23,6 +23,8 @@ import com.fsck.k9.*;
 import com.fsck.k9.Account.FolderMode;
 import com.fsck.k9.activity.setup.AccountSettings;
 import com.fsck.k9.activity.setup.FolderSettings;
+import com.fsck.k9.controller.MessagingController;
+import com.fsck.k9.controller.MessagingListener;
 import com.fsck.k9.helper.power.TracingPowerManager;
 import com.fsck.k9.helper.power.TracingPowerManager.TracingWakeLock;
 import com.fsck.k9.mail.Flag;

src/com/fsck/k9/activity/K9Activity.java

@@ -1,4 +1,4 @@
-package com.fsck.k9;
+package com.fsck.k9.activity;
 
 
 import android.app.Activity;
@@ -9,7 +9,7 @@ import android.view.View;
 import android.view.GestureDetector.SimpleOnGestureListener;
 import android.widget.ScrollView;
 
-import com.fsck.k9.activity.DateFormatter;
+import com.fsck.k9.K9;
 
 
 public class K9Activity extends Activity

src/com/fsck/k9/activity/K9ListActivity.java

@@ -1,8 +1,8 @@
-package com.fsck.k9;
+package com.fsck.k9.activity;
 
 import android.app.ListActivity;
 import android.os.Bundle;
-import com.fsck.k9.activity.DateFormatter;
+import com.fsck.k9.K9;
 
 
 public class K9ListActivity extends ListActivity

src/com/fsck/k9/activity/K9PreferenceActivity.java

@@ -1,5 +1,6 @@
-package com.fsck.k9;
+package com.fsck.k9.activity;
 
+import com.fsck.k9.K9;
 import android.os.Bundle;
 import android.preference.PreferenceActivity;
 

src/com/fsck/k9/activity/MessageCompose.java

@@ -23,6 +23,9 @@ import android.view.Window;
 import android.widget.AutoCompleteTextView.Validator;
 import android.widget.*;
 import com.fsck.k9.*;
+import com.fsck.k9.controller.MessagingController;
+import com.fsck.k9.controller.MessagingListener;
+import com.fsck.k9.helper.Utility;
 import com.fsck.k9.mail.*;
 import com.fsck.k9.mail.Message.RecipientType;
 import com.fsck.k9.mail.internet.*;

src/com/fsck/k9/activity/MessageList.java

@@ -23,10 +23,13 @@ import android.widget.*;
 import android.widget.AdapterView.AdapterContextMenuInfo;
 import android.widget.CompoundButton.OnCheckedChangeListener;
 import com.fsck.k9.*;
-import com.fsck.k9.MessagingController.SORT_TYPE;
 import com.fsck.k9.activity.setup.Prefs;
 import com.fsck.k9.activity.setup.AccountSettings;
 import com.fsck.k9.activity.setup.FolderSettings;
+import com.fsck.k9.controller.MessagingController;
+import com.fsck.k9.controller.MessagingListener;
+import com.fsck.k9.controller.MessagingController.SORT_TYPE;
+import com.fsck.k9.helper.Utility;
 import com.fsck.k9.mail.*;
 import com.fsck.k9.mail.Message.RecipientType;
 import com.fsck.k9.mail.store.LocalStore;

src/com/fsck/k9/activity/MessageView.java

@@ -26,6 +26,8 @@ import android.view.animation.TranslateAnimation;
 import android.webkit.*;
 import android.widget.*;
 import com.fsck.k9.*;
+import com.fsck.k9.controller.MessagingController;
+import com.fsck.k9.controller.MessagingListener;
 import com.fsck.k9.mail.*;
 import com.fsck.k9.mail.Message.RecipientType;
 import com.fsck.k9.mail.internet.MimeUtility;

src/com/fsck/k9/activity/setup/AccountSettings.java

@@ -12,10 +12,11 @@ import com.fsck.k9.*;
 import com.fsck.k9.Account.FolderMode;
 import com.fsck.k9.activity.ChooseFolder;
 import com.fsck.k9.activity.ChooseIdentity;
+import com.fsck.k9.activity.ColorPickerDialog;
+import com.fsck.k9.activity.K9PreferenceActivity;
 import com.fsck.k9.activity.ManageIdentities;
 import com.fsck.k9.mail.Store;
 import com.fsck.k9.service.MailService;
-import com.fsck.k9.ColorPickerDialog;
 
 public class AccountSettings extends K9PreferenceActivity
 {

src/com/fsck/k9/activity/setup/AccountSetupAccountType.java

@@ -11,9 +11,9 @@ import android.widget.Button;
 import android.widget.Toast;
 import com.fsck.k9.Account;
 import com.fsck.k9.K9;
-import com.fsck.k9.K9Activity;
 import com.fsck.k9.Preferences;
 import com.fsck.k9.R;
+import com.fsck.k9.activity.K9Activity;
 import java.net.URI;
 
 /**

src/com/fsck/k9/activity/setup/AccountSetupBasics.java

@@ -21,6 +21,8 @@ import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.EditText;
 import com.fsck.k9.*;
+import com.fsck.k9.activity.K9Activity;
+import com.fsck.k9.helper.Utility;
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.net.URI;

src/com/fsck/k9/activity/setup/AccountSetupCheckSettings.java

@@ -15,6 +15,8 @@ import android.widget.Button;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import com.fsck.k9.*;
+import com.fsck.k9.activity.K9Activity;
+import com.fsck.k9.controller.MessagingController;
 import com.fsck.k9.mail.AuthenticationFailedException;
 import com.fsck.k9.mail.CertificateValidationException;
 import com.fsck.k9.mail.Store;

src/com/fsck/k9/activity/setup/AccountSetupComposition.java

@@ -11,9 +11,9 @@ import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.RadioButton;
 import com.fsck.k9.Account;
-import com.fsck.k9.K9Activity;
 import com.fsck.k9.Preferences;
 import com.fsck.k9.R;
+import com.fsck.k9.activity.K9Activity;
 
 public class AccountSetupComposition extends K9Activity
 {

src/com/fsck/k9/activity/setup/AccountSetupIncoming.java

@@ -14,6 +14,8 @@ import android.widget.*;
 
 import com.fsck.k9.*;
 import com.fsck.k9.activity.ChooseFolder;
+import com.fsck.k9.activity.K9Activity;
+import com.fsck.k9.helper.Utility;
 import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.net.URISyntaxException;

src/com/fsck/k9/activity/setup/AccountSetupNames.java

@@ -13,6 +13,8 @@ import android.view.View.OnClickListener;
 import android.widget.Button;
 import android.widget.EditText;
 import com.fsck.k9.*;
+import com.fsck.k9.activity.K9Activity;
+import com.fsck.k9.helper.Utility;
 
 public class AccountSetupNames extends K9Activity implements OnClickListener
 {

src/com/fsck/k9/activity/setup/AccountSetupOptions.java

@@ -11,6 +11,7 @@ import android.widget.ArrayAdapter;
 import android.widget.CheckBox;
 import android.widget.Spinner;
 import com.fsck.k9.*;
+import com.fsck.k9.activity.K9Activity;
 import com.fsck.k9.mail.Store;
 
 public class AccountSetupOptions extends K9Activity implements OnClickListener

src/com/fsck/k9/activity/setup/AccountSetupOutgoing.java

@@ -14,6 +14,8 @@ import android.view.ViewGroup;
 import android.widget.*;
 import android.widget.CompoundButton.OnCheckedChangeListener;
 import com.fsck.k9.*;
+import com.fsck.k9.activity.K9Activity;
+import com.fsck.k9.helper.Utility;
 import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.net.URISyntaxException;

src/com/fsck/k9/activity/setup/FolderSettings.java

@@ -10,6 +10,7 @@ import android.preference.Preference;
 import android.util.Log;
 import android.view.KeyEvent;
 import com.fsck.k9.*;
+import com.fsck.k9.activity.K9PreferenceActivity;
 import com.fsck.k9.mail.Folder.FolderClass;
 import com.fsck.k9.mail.MessagingException;
 import com.fsck.k9.mail.Store;

src/com/fsck/k9/activity/setup/FontSizeSettings.java

@@ -9,6 +9,7 @@ import android.os.Bundle;
 import android.preference.*;
 import android.view.KeyEvent;
 import com.fsck.k9.*;
+import com.fsck.k9.activity.K9PreferenceActivity;
 
 /**
  * Activity to configure the font size of the information displayed in the

src/com/fsck/k9/activity/setup/Prefs.java

@@ -10,10 +10,10 @@ import android.preference.ListPreference;
 import android.preference.Preference;
 import android.view.KeyEvent;
 import com.fsck.k9.K9;
-import com.fsck.k9.K9PreferenceActivity;
 import com.fsck.k9.Preferences;
 import com.fsck.k9.R;
 import com.fsck.k9.activity.DateFormatter;
+import com.fsck.k9.activity.K9PreferenceActivity;
 import com.fsck.k9.service.MailService;
 
 public class Prefs extends K9PreferenceActivity

src/com/fsck/k9/controller/MessageDateComparator.java

@@ -1,7 +1,8 @@
 
-package com.fsck.k9.mail;
+package com.fsck.k9.controller;
 
 import java.util.Comparator;
+import com.fsck.k9.mail.Message;
 
 public class MessageDateComparator implements Comparator<Message>
 {

src/com/fsck/k9/controller/MessageRemovalListener.java

@@ -1,4 +1,6 @@
-package com.fsck.k9.mail;
+package com.fsck.k9.controller;
+
+import com.fsck.k9.mail.Message;
 
 public interface MessageRemovalListener
 {

src/com/fsck/k9/controller/MessageRetrievalListener.java

@@ -1,5 +1,7 @@
 
-package com.fsck.k9.mail;
+package com.fsck.k9.controller;
+
+import com.fsck.k9.mail.Message;
 
 public interface MessageRetrievalListener
 {

src/com/fsck/k9/controller/MessagingController.java

@@ -1,5 +1,5 @@
 
-package com.fsck.k9;
+package com.fsck.k9.controller;
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
@@ -37,8 +37,19 @@ import android.os.PowerManager.WakeLock;
 import android.text.TextUtils;
 import android.util.Log;
 
+import com.fsck.k9.Account;
+import com.fsck.k9.AccountStats;
+import com.fsck.k9.K9;
+import com.fsck.k9.Preferences;
+import com.fsck.k9.R;
+import com.fsck.k9.SearchSpecification;
+import com.fsck.k9.Account.FolderMode;
+import com.fsck.k9.Account.Searchable;
+import com.fsck.k9.R.drawable;
+import com.fsck.k9.R.string;
 import com.fsck.k9.activity.FolderList;
 import com.fsck.k9.activity.MessageList;
+import com.fsck.k9.helper.Utility;
 import com.fsck.k9.helper.power.TracingPowerManager;
 import com.fsck.k9.helper.power.TracingPowerManager.TracingWakeLock;
 import com.fsck.k9.mail.Address;
@@ -46,8 +57,6 @@ import com.fsck.k9.mail.FetchProfile;
 import com.fsck.k9.mail.Flag;
 import com.fsck.k9.mail.Folder;
 import com.fsck.k9.mail.Message;
-import com.fsck.k9.mail.MessageRemovalListener;
-import com.fsck.k9.mail.MessageRetrievalListener;
 import com.fsck.k9.mail.MessagingException;
 import com.fsck.k9.mail.Part;
 import com.fsck.k9.mail.PushReceiver;

src/com/fsck/k9/controller/MessagingControllerPushReceiver.java

@@ -1,4 +1,4 @@
-package com.fsck.k9;
+package com.fsck.k9.controller;
 
 import android.app.Application;
 import android.content.Context;
@@ -6,6 +6,8 @@ import android.os.PowerManager;
 import android.os.PowerManager.WakeLock;
 import android.util.Log;
 
+import com.fsck.k9.Account;
+import com.fsck.k9.K9;
 import com.fsck.k9.helper.power.TracingPowerManager;
 import com.fsck.k9.helper.power.TracingPowerManager.TracingWakeLock;
 import com.fsck.k9.mail.Folder;

src/com/fsck/k9/controller/MessagingListener.java

@@ -1,7 +1,10 @@
 
-package com.fsck.k9;
+package com.fsck.k9.controller;
 
 import android.content.Context;
+import com.fsck.k9.Account;
+import com.fsck.k9.AccountStats;
+import com.fsck.k9.BaseAccount;
 import com.fsck.k9.mail.Folder;
 import com.fsck.k9.mail.Message;
 import com.fsck.k9.mail.Part;

src/com/fsck/k9/helper/Utility.java

@@ -1,10 +1,10 @@
 
-package com.fsck.k9;
+package com.fsck.k9.helper;
 
 import android.text.Editable;
 import android.widget.EditText;
 import android.widget.TextView;
-import com.fsck.k9.codec.binary.Base64;
+import com.fsck.k9.mail.filter.Base64;
 
 import java.io.IOException;
 import java.io.InputStream;

src/com/fsck/k9/mail/Address.java

@@ -5,7 +5,7 @@ import android.text.util.Rfc822Token;
 import android.text.util.Rfc822Tokenizer;
 import android.util.Log;
 import com.fsck.k9.K9;
-import com.fsck.k9.Utility;
+import com.fsck.k9.helper.Utility;
 import org.apache.james.mime4j.codec.EncoderUtil;
 import org.apache.james.mime4j.field.address.AddressList;
 import org.apache.james.mime4j.field.address.Mailbox;

src/com/fsck/k9/mail/Folder.java

@@ -2,6 +2,7 @@ package com.fsck.k9.mail;
 
 import com.fsck.k9.Account;
 import com.fsck.k9.Preferences;
+import com.fsck.k9.controller.MessageRetrievalListener;
 
 
 public abstract class Folder

src/com/fsck/k9/mail/NoSuchProviderException.java

@@ -1,17 +0,0 @@
-
-package com.fsck.k9.mail;
-
-public class NoSuchProviderException extends MessagingException
-{
-    public static final long serialVersionUID = -1;
-
-    public NoSuchProviderException(String message)
-    {
-        super(message);
-    }
-
-    public NoSuchProviderException(String message, Throwable throwable)
-    {
-        super(message, throwable);
-    }
-}

src/com/fsck/k9/mail/filter/Base64.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.fsck.k9.codec.binary;
+package com.fsck.k9.mail.filter;
 
 import org.apache.commons.codec.BinaryDecoder;
 import org.apache.commons.codec.BinaryEncoder;

src/com/fsck/k9/mail/filter/Base64OutputStream.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.fsck.k9.codec.binary;
+package com.fsck.k9.mail.filter;
 
 import java.io.FilterOutputStream;
 import java.io.IOException;

src/com/fsck/k9/mail/filter/CountingOutputStream.java

@@ -1,4 +1,4 @@
-package com.fsck.k9.mail.transport;
+package com.fsck.k9.mail.filter;
 
 import java.io.IOException;
 import java.io.OutputStream;

src/com/fsck/k9/mail/filter/EOLConvertingOutputStream.java

@@ -1,4 +1,4 @@
-package com.fsck.k9.mail.transport;
+package com.fsck.k9.mail.filter;
 
 import java.io.FilterOutputStream;
 import java.io.IOException;

src/com/fsck/k9/mail/filter/FixedLengthInputStream.java

@@ -1,5 +1,5 @@
 
-package com.fsck.k9;
+package com.fsck.k9.mail.filter;
 
 import java.io.IOException;
 import java.io.InputStream;

src/com/fsck/k9/mail/filter/LineWrapOutputStream.java

@@ -1,4 +1,4 @@
-package com.fsck.k9.mail.transport;
+package com.fsck.k9.mail.filter;
 
 import java.io.FilterOutputStream;
 import java.io.IOException;

src/com/fsck/k9/mail/filter/PeekableInputStream.java

@@ -1,5 +1,5 @@
 
-package com.fsck.k9;
+package com.fsck.k9.mail.filter;
 
 import java.io.IOException;
 import java.io.InputStream;

src/com/fsck/k9/mail/filter/SmtpDataStuffing.java

@@ -1,4 +1,4 @@
-package com.fsck.k9.mail.transport;
+package com.fsck.k9.mail.filter;
 
 import java.io.FilterOutputStream;
 import java.io.IOException;

src/com/fsck/k9/mail/filter/StatusOutputStream.java

@@ -1,4 +1,4 @@
-package com.fsck.k9.mail.transport;
+package com.fsck.k9.mail.filter;
 
 import android.util.Config;
 import android.util.Log;

src/com/fsck/k9/mail/internet/BinaryTempFileBody.java

@@ -1,8 +1,8 @@
 package com.fsck.k9.mail.internet;
 
-import com.fsck.k9.codec.binary.Base64OutputStream;
 import com.fsck.k9.mail.Body;
 import com.fsck.k9.mail.MessagingException;
+import com.fsck.k9.mail.filter.Base64OutputStream;
 import org.apache.commons.io.IOUtils;
 
 import java.io.*;

src/com/fsck/k9/mail/internet/MimeHeader.java

@@ -1,7 +1,7 @@
 
 package com.fsck.k9.mail.internet;
 
-import com.fsck.k9.Utility;
+import com.fsck.k9.helper.Utility;
 import com.fsck.k9.mail.MessagingException;
 import org.apache.james.mime4j.codec.EncoderUtil;
 

src/com/fsck/k9/mail/store/ImapResponseParser.java

@@ -2,9 +2,9 @@ package com.fsck.k9.mail.store;
 
 import android.util.Log;
 import com.fsck.k9.K9;
-import com.fsck.k9.FixedLengthInputStream;
-import com.fsck.k9.PeekableInputStream;
 import com.fsck.k9.mail.MessagingException;
+import com.fsck.k9.mail.filter.FixedLengthInputStream;
+import com.fsck.k9.mail.filter.PeekableInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.text.ParseException;

src/com/fsck/k9/mail/store/ImapStore.java

@@ -7,18 +7,19 @@ import android.net.NetworkInfo;
 import android.os.PowerManager;
 import android.util.Log;
 import com.fsck.k9.Account;
-import com.fsck.k9.FixedLengthInputStream;
 import com.fsck.k9.K9;
-import com.fsck.k9.PeekableInputStream;
+import com.fsck.k9.controller.MessageRetrievalListener;
-import com.fsck.k9.Utility;
+import com.fsck.k9.helper.Utility;
 import com.fsck.k9.helper.power.TracingPowerManager;
 import com.fsck.k9.helper.power.TracingPowerManager.TracingWakeLock;
 import com.fsck.k9.mail.*;
+import com.fsck.k9.mail.filter.CountingOutputStream;
+import com.fsck.k9.mail.filter.EOLConvertingOutputStream;
+import com.fsck.k9.mail.filter.FixedLengthInputStream;
+import com.fsck.k9.mail.filter.PeekableInputStream;
 import com.fsck.k9.mail.internet.*;
 import com.fsck.k9.mail.store.ImapResponseParser.ImapList;
 import com.fsck.k9.mail.store.ImapResponseParser.ImapResponse;
-import com.fsck.k9.mail.transport.CountingOutputStream;
-import com.fsck.k9.mail.transport.EOLConvertingOutputStream;
 import com.jcraft.jzlib.JZlib;
 import com.jcraft.jzlib.ZInputStream;
 import com.jcraft.jzlib.ZOutputStream;

src/com/fsck/k9/mail/store/LocalStore.java

@@ -13,10 +13,12 @@ import android.util.Log;
 import com.fsck.k9.Account;
 import com.fsck.k9.K9;
 import com.fsck.k9.Preferences;
-import com.fsck.k9.Utility;
+import com.fsck.k9.controller.MessageRemovalListener;
-import com.fsck.k9.codec.binary.Base64OutputStream;
+import com.fsck.k9.controller.MessageRetrievalListener;
+import com.fsck.k9.helper.Utility;
 import com.fsck.k9.mail.*;
 import com.fsck.k9.mail.Message.RecipientType;
+import com.fsck.k9.mail.filter.Base64OutputStream;
 import com.fsck.k9.mail.internet.*;
 import com.fsck.k9.provider.AttachmentProvider;
 import org.apache.commons.io.IOUtils;

src/com/fsck/k9/mail/store/Pop3Store.java

@@ -6,7 +6,8 @@ import android.util.Log;
 
 import com.fsck.k9.Account;
 import com.fsck.k9.K9;
-import com.fsck.k9.Utility;
+import com.fsck.k9.controller.MessageRetrievalListener;
+import com.fsck.k9.helper.Utility;
 import com.fsck.k9.mail.*;
 import com.fsck.k9.mail.Folder.OpenMode;
 import com.fsck.k9.mail.internet.MimeMessage;

src/com/fsck/k9/mail/store/WebDavStore.java

@@ -4,11 +4,12 @@ import android.util.Log;
 
 import com.fsck.k9.Account;
 import com.fsck.k9.K9;
-import com.fsck.k9.Utility;
+import com.fsck.k9.controller.MessageRetrievalListener;
+import com.fsck.k9.helper.Utility;
 import com.fsck.k9.mail.*;
 import com.fsck.k9.mail.Folder.OpenMode;
+import com.fsck.k9.mail.filter.EOLConvertingOutputStream;
 import com.fsck.k9.mail.internet.MimeMessage;
-import com.fsck.k9.mail.transport.EOLConvertingOutputStream;
 import com.fsck.k9.mail.transport.TrustedSocketFactory;
 import org.apache.http.*;
 import org.apache.http.auth.AuthScope;

src/com/fsck/k9/mail/transport/SmtpTransport.java

@@ -3,10 +3,13 @@ package com.fsck.k9.mail.transport;
 
 import android.util.Log;
 import com.fsck.k9.K9;
-import com.fsck.k9.PeekableInputStream;
-import com.fsck.k9.codec.binary.Base64;
 import com.fsck.k9.mail.*;
 import com.fsck.k9.mail.Message.RecipientType;
+import com.fsck.k9.mail.filter.Base64;
+import com.fsck.k9.mail.filter.EOLConvertingOutputStream;
+import com.fsck.k9.mail.filter.LineWrapOutputStream;
+import com.fsck.k9.mail.filter.PeekableInputStream;
+import com.fsck.k9.mail.filter.SmtpDataStuffing;
 import com.fsck.k9.mail.store.TrustManagerFactory;
 
 import javax.net.ssl.SSLContext;

src/com/fsck/k9/mail/transport/WebDavTransport.java

@@ -5,10 +5,10 @@ import android.util.Log;
 
 import com.fsck.k9.Account;
 import com.fsck.k9.K9;
-import com.fsck.k9.PeekableInputStream;
 import com.fsck.k9.mail.Message;
 import com.fsck.k9.mail.MessagingException;
 import com.fsck.k9.mail.Transport;
+import com.fsck.k9.mail.filter.PeekableInputStream;
 import com.fsck.k9.mail.store.WebDavStore;
 
 import java.io.OutputStream;

src/com/fsck/k9/preferences/Storage.java

@@ -8,7 +8,7 @@ import android.database.sqlite.SQLiteDatabase;
 import android.util.Log;
 
 import com.fsck.k9.K9;
-import com.fsck.k9.Utility;
+import com.fsck.k9.helper.Utility;
 
 import java.net.URI;
 import java.net.URLEncoder;

src/com/fsck/k9/service/MailService.java

@@ -18,10 +18,10 @@ import android.util.Log;
 
 import com.fsck.k9.Account;
 import com.fsck.k9.K9;
-import com.fsck.k9.MessagingController;
 import com.fsck.k9.Preferences;
 import com.fsck.k9.R;
 import com.fsck.k9.Account.FolderMode;
+import com.fsck.k9.controller.MessagingController;
 import com.fsck.k9.helper.AutoSyncHelper;
 import com.fsck.k9.mail.Pusher;
 

src/com/fsck/k9/service/PollService.java

@@ -7,6 +7,8 @@ import android.os.PowerManager;
 import android.os.PowerManager.WakeLock;
 import android.util.Log;
 import com.fsck.k9.*;
+import com.fsck.k9.controller.MessagingController;
+import com.fsck.k9.controller.MessagingListener;
 import com.fsck.k9.helper.power.TracingPowerManager;
 import com.fsck.k9.helper.power.TracingPowerManager.TracingWakeLock;