local -> mailstore

src/com/fsck/k9/Account.java

@@ -32,9 +32,9 @@ import com.fsck.k9.mail.Folder.FolderClass;
 import com.fsck.k9.mail.filter.Base64;
 import com.fsck.k9.mail.store.RemoteStore;
 import com.fsck.k9.mail.store.StoreConfig;
-import com.fsck.k9.local.StorageManager;
+import com.fsck.k9.mailstore.StorageManager;
-import com.fsck.k9.local.StorageManager.StorageProvider;
+import com.fsck.k9.mailstore.StorageManager.StorageProvider;
-import com.fsck.k9.local.LocalStore;
+import com.fsck.k9.mailstore.LocalStore;
 import com.fsck.k9.provider.EmailProvider;
 import com.fsck.k9.provider.EmailProvider.StatsColumns;
 import com.fsck.k9.search.ConditionsTreeNode;

src/com/fsck/k9/K9.java

@@ -36,7 +36,7 @@ import com.fsck.k9.mail.Address;
 import com.fsck.k9.mail.Message;
 import com.fsck.k9.mail.MessagingException;
 import com.fsck.k9.mail.internet.BinaryTempFileBody;
-import com.fsck.k9.local.LocalStore;
+import com.fsck.k9.mailstore.LocalStore;
 import com.fsck.k9.provider.UnreadWidgetProvider;
 import com.fsck.k9.mail.ssl.LocalKeyStore;
 import com.fsck.k9.service.BootReceiver;

src/com/fsck/k9/Preferences.java

@@ -13,7 +13,7 @@ import android.content.Context;
 import android.content.SharedPreferences;
 import android.util.Log;
 
-import com.fsck.k9.local.LocalStore;
+import com.fsck.k9.mailstore.LocalStore;
 import com.fsck.k9.preferences.Editor;
 import com.fsck.k9.preferences.Storage;
 

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

@@ -80,7 +80,7 @@ import com.fsck.k9.mail.ServerSettings;
 import com.fsck.k9.mail.Transport;
 import com.fsck.k9.mail.internet.MimeUtility;
 import com.fsck.k9.mail.store.RemoteStore;
-import com.fsck.k9.local.StorageManager;
+import com.fsck.k9.mailstore.StorageManager;
 import com.fsck.k9.mail.store.WebDavStore;
 import com.fsck.k9.preferences.SettingsExporter;
 import com.fsck.k9.preferences.SettingsImportExportException;

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

@@ -55,7 +55,7 @@ import com.fsck.k9.helper.power.TracingPowerManager;
 import com.fsck.k9.helper.power.TracingPowerManager.TracingWakeLock;
 import com.fsck.k9.mail.Folder;
 import com.fsck.k9.mail.Message;
-import com.fsck.k9.local.LocalFolder;
+import com.fsck.k9.mailstore.LocalFolder;
 import com.fsck.k9.search.LocalSearch;
 import com.fsck.k9.search.SearchSpecification.Attribute;
 import com.fsck.k9.search.SearchSpecification.Searchfield;

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

@@ -109,10 +109,10 @@ import com.fsck.k9.mail.internet.MimeMultipart;
 import com.fsck.k9.mail.internet.MimeUtility;
 import com.fsck.k9.mail.internet.TextBody;
 import com.fsck.k9.mail.internet.TextBodyBuilder;
-import com.fsck.k9.local.LocalAttachmentBody;
+import com.fsck.k9.mailstore.LocalAttachmentBody;
-import com.fsck.k9.local.LocalMessage;
+import com.fsck.k9.mailstore.LocalMessage;
-import com.fsck.k9.local.TempFileBody;
+import com.fsck.k9.mailstore.TempFileBody;
-import com.fsck.k9.local.TempFileMessageBody;
+import com.fsck.k9.mailstore.TempFileMessageBody;
 import com.fsck.k9.view.MessageWebView;
 
 import org.apache.james.mime4j.codec.EncoderUtil;

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

@@ -2,7 +2,7 @@ package com.fsck.k9.activity;
 
 import java.util.Date;
 
-import com.fsck.k9.local.LocalMessage;
+import com.fsck.k9.mailstore.LocalMessage;
 
 public class MessageInfoHolder {
     public String date;

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

@@ -42,8 +42,8 @@ import com.fsck.k9.fragment.MessageListFragment;
 import com.fsck.k9.fragment.MessageListFragment.MessageListFragmentListener;
 import com.fsck.k9.fragment.MessageViewFragment;
 import com.fsck.k9.fragment.MessageViewFragment.MessageViewFragmentListener;
-import com.fsck.k9.local.StorageManager;
+import com.fsck.k9.mailstore.StorageManager;
-import com.fsck.k9.local.LocalMessage;
+import com.fsck.k9.mailstore.LocalMessage;
 import com.fsck.k9.search.LocalSearch;
 import com.fsck.k9.search.SearchAccount;
 import com.fsck.k9.search.SearchSpecification;

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

@@ -10,8 +10,8 @@ import com.fsck.k9.K9;
 import com.fsck.k9.Preferences;
 import com.fsck.k9.mail.Flag;
 import com.fsck.k9.mail.MessagingException;
-import com.fsck.k9.local.LocalFolder;
+import com.fsck.k9.mailstore.LocalFolder;
-import com.fsck.k9.local.LocalMessage;
+import com.fsck.k9.mailstore.LocalMessage;
 import com.fsck.k9.mail.filter.Base64;
 
 import java.util.StringTokenizer;

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

@@ -30,7 +30,7 @@ import android.widget.TextView;
  * <li>{@link #actionUpgradeDatabases(Context, Intent)} will call {@link K9#areDatabasesUpToDate()}
  *     to check if we already know whether the databases have been upgraded.</li>
  * <li>{@link K9#areDatabasesUpToDate()} will compare the last known database version stored in a
- *     {@link SharedPreferences} file to {@link com.fsck.k9.local.LocalStore#DB_VERSION}. This
+ *     {@link SharedPreferences} file to {@link com.fsck.k9.mailstore.LocalStore#DB_VERSION}. This
  *     is done as an optimization because it's faster than opening all of the accounts' databases
  *     one by one.</li>
  * <li>If there was an error reading the cached database version or if it shows the databases need

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

@@ -36,8 +36,8 @@ import com.fsck.k9.activity.K9PreferenceActivity;
 import com.fsck.k9.activity.ManageIdentities;
 import com.fsck.k9.mail.Folder;
 import com.fsck.k9.mail.Store;
-import com.fsck.k9.local.LocalFolder;
+import com.fsck.k9.mailstore.LocalFolder;
-import com.fsck.k9.local.StorageManager;
+import com.fsck.k9.mailstore.StorageManager;
 import com.fsck.k9.service.MailService;
 
 import org.openintents.openpgp.util.OpenPgpListPreference;

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

@@ -16,8 +16,8 @@ import com.fsck.k9.mail.Folder.FolderClass;
 
 import com.fsck.k9.mail.MessagingException;
 import com.fsck.k9.mail.Store;
-import com.fsck.k9.local.LocalFolder;
+import com.fsck.k9.mailstore.LocalFolder;
-import com.fsck.k9.local.LocalStore;
+import com.fsck.k9.mailstore.LocalStore;
 import com.fsck.k9.service.MailService;
 
 public class FolderSettings extends K9PreferenceActivity {

src/com/fsck/k9/cache/EmailProviderCache.java

@@ -11,8 +11,8 @@ import android.support.v4.content.LocalBroadcastManager;
 
 import com.fsck.k9.fragment.MessageListFragment;
 import com.fsck.k9.mail.Message;
-import com.fsck.k9.local.LocalFolder;
+import com.fsck.k9.mailstore.LocalFolder;
-import com.fsck.k9.local.LocalMessage;
+import com.fsck.k9.mailstore.LocalMessage;
 import com.fsck.k9.provider.EmailProvider;
 
 /**

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

@@ -81,14 +81,14 @@ import com.fsck.k9.mail.Transport;
 import com.fsck.k9.mail.internet.MimeMessage;
 import com.fsck.k9.mail.internet.MimeUtility;
 import com.fsck.k9.mail.internet.TextBody;
-import com.fsck.k9.local.MessageRemovalListener;
+import com.fsck.k9.mailstore.MessageRemovalListener;
 import com.fsck.k9.mail.MessageRetrievalListener;
-import com.fsck.k9.local.LocalFolder;
+import com.fsck.k9.mailstore.LocalFolder;
-import com.fsck.k9.local.LocalMessage;
+import com.fsck.k9.mailstore.LocalMessage;
-import com.fsck.k9.local.LocalStore;
+import com.fsck.k9.mailstore.LocalStore;
-import com.fsck.k9.local.LocalStore.PendingCommand;
+import com.fsck.k9.mailstore.LocalStore.PendingCommand;
 import com.fsck.k9.mail.store.Pop3Store;
-import com.fsck.k9.local.UnavailableStorageException;
+import com.fsck.k9.mailstore.UnavailableStorageException;
 import com.fsck.k9.provider.EmailProvider;
 import com.fsck.k9.provider.EmailProvider.StatsColumns;
 import com.fsck.k9.search.ConditionsTreeNode;

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

@@ -11,8 +11,8 @@ import com.fsck.k9.mail.Folder;
 
 import com.fsck.k9.mail.Message;
 import com.fsck.k9.mail.PushReceiver;
-import com.fsck.k9.local.LocalFolder;
+import com.fsck.k9.mailstore.LocalFolder;
-import com.fsck.k9.local.LocalStore;
+import com.fsck.k9.mailstore.LocalStore;
 import com.fsck.k9.service.SleepService;
 
 import java.util.List;

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

@@ -11,7 +11,7 @@ import com.fsck.k9.BaseAccount;
 import com.fsck.k9.mail.Folder;
 import com.fsck.k9.mail.Message;
 import com.fsck.k9.mail.Part;
-import com.fsck.k9.local.LocalMessage;
+import com.fsck.k9.mailstore.LocalMessage;
 
 /**
  * Defines the interface that {@link MessagingController} will use to callback to requesters.

src/com/fsck/k9/fragment/MessageListFragment.java

@@ -88,9 +88,9 @@ import com.fsck.k9.mail.Flag;
 import com.fsck.k9.mail.Folder;
 import com.fsck.k9.mail.Message;
 import com.fsck.k9.mail.MessagingException;
-import com.fsck.k9.local.LocalFolder;
+import com.fsck.k9.mailstore.LocalFolder;
-import com.fsck.k9.local.LocalMessage;
+import com.fsck.k9.mailstore.LocalMessage;
-import com.fsck.k9.local.LocalStore;
+import com.fsck.k9.mailstore.LocalStore;
 import com.fsck.k9.provider.EmailProvider;
 import com.fsck.k9.provider.EmailProvider.MessageColumns;
 import com.fsck.k9.provider.EmailProvider.SpecialColumns;

src/com/fsck/k9/fragment/MessageViewFragment.java

@@ -38,7 +38,7 @@ import com.fsck.k9.mail.Flag;
 import com.fsck.k9.mail.Message;
 import com.fsck.k9.mail.MessagingException;
 import com.fsck.k9.mail.Part;
-import com.fsck.k9.local.LocalMessage;
+import com.fsck.k9.mailstore.LocalMessage;
 import com.fsck.k9.view.AttachmentView;
 import com.fsck.k9.view.AttachmentView.AttachmentFileDownloadCallback;
 import com.fsck.k9.view.MessageHeader;

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

@@ -13,7 +13,7 @@ import com.fsck.k9.mail.Address;
 import com.fsck.k9.mail.Flag;
 import com.fsck.k9.mail.MessagingException;
 import com.fsck.k9.mail.Message.RecipientType;
-import com.fsck.k9.local.LocalMessage;
+import com.fsck.k9.mailstore.LocalMessage;
 
 public class MessageHelper {
 

src/com/fsck/k9/mailstore/AttachmentMessageBodyUtil.java

@@ -1,4 +1,4 @@
-package com.fsck.k9.local;
+package com.fsck.k9.mailstore;
 
 import java.io.IOException;
 import java.io.InputStream;

src/com/fsck/k9/mailstore/BinaryAttachmentBody.java

@@ -1,4 +1,4 @@
-package com.fsck.k9.local;
+package com.fsck.k9.mailstore;
 
 import java.io.IOException;
 import java.io.InputStream;

src/com/fsck/k9/mailstore/LocalAttachmentBody.java

@@ -1,4 +1,4 @@
-package com.fsck.k9.local;
+package com.fsck.k9.mailstore;
 
 import java.io.ByteArrayInputStream;
 import java.io.FileNotFoundException;

src/com/fsck/k9/mailstore/LocalAttachmentBodyPart.java

@@ -1,4 +1,4 @@
-package com.fsck.k9.local;
+package com.fsck.k9.mailstore;
 
 import com.fsck.k9.mail.Body;
 import com.fsck.k9.mail.MessagingException;

src/com/fsck/k9/mailstore/LocalAttachmentMessageBody.java

@@ -1,4 +1,4 @@
-package com.fsck.k9.local;
+package com.fsck.k9.mailstore;
 
 import java.io.IOException;
 import java.io.OutputStream;

src/com/fsck/k9/mailstore/LocalFolder.java

@@ -1,4 +1,4 @@
-package com.fsck.k9.local;
+package com.fsck.k9.mailstore;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -52,8 +52,8 @@ import com.fsck.k9.mail.internet.MimeMultipart;
 import com.fsck.k9.mail.internet.MimeUtility;
 import com.fsck.k9.mail.internet.TextBody;
 import com.fsck.k9.mail.internet.MimeUtility.ViewableContainer;
-import com.fsck.k9.local.LockableDatabase.DbCallback;
+import com.fsck.k9.mailstore.LockableDatabase.DbCallback;
-import com.fsck.k9.local.LockableDatabase.WrappedException;
+import com.fsck.k9.mailstore.LockableDatabase.WrappedException;
 import com.fsck.k9.provider.AttachmentProvider;
 
 public class LocalFolder extends Folder<LocalMessage> implements Serializable {

src/com/fsck/k9/mailstore/LocalMessage.java

@@ -1,4 +1,4 @@
-package com.fsck.k9.local;
+package com.fsck.k9.mailstore;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -22,8 +22,8 @@ import com.fsck.k9.mail.MessagingException;
 import com.fsck.k9.mail.Part;
 import com.fsck.k9.mail.internet.MimeMessage;
 import com.fsck.k9.mail.internet.MimeUtility;
-import com.fsck.k9.local.LockableDatabase.DbCallback;
+import com.fsck.k9.mailstore.LockableDatabase.DbCallback;
-import com.fsck.k9.local.LockableDatabase.WrappedException;
+import com.fsck.k9.mailstore.LockableDatabase.WrappedException;
 
 public class LocalMessage extends MimeMessage {
     protected MessageReference mReference;

src/com/fsck/k9/mailstore/LocalStore.java

@@ -1,5 +1,5 @@
 
-package com.fsck.k9.local;
+package com.fsck.k9.mailstore;
 
 import android.app.Application;
 import android.content.ContentResolver;
@@ -22,10 +22,10 @@ import com.fsck.k9.mail.MessageRetrievalListener;
 import com.fsck.k9.mail.MessagingException;
 import com.fsck.k9.mail.Store;
 import com.fsck.k9.mail.store.RemoteStore;
-import com.fsck.k9.local.StorageManager.StorageProvider;
+import com.fsck.k9.mailstore.StorageManager.StorageProvider;
 import com.fsck.k9.mail.store.StoreConfig;
-import com.fsck.k9.local.LockableDatabase.DbCallback;
+import com.fsck.k9.mailstore.LockableDatabase.DbCallback;
-import com.fsck.k9.local.LockableDatabase.WrappedException;
+import com.fsck.k9.mailstore.LockableDatabase.WrappedException;
 import com.fsck.k9.provider.EmailProvider;
 import com.fsck.k9.provider.EmailProvider.MessageColumns;
 import com.fsck.k9.search.LocalSearch;

src/com/fsck/k9/mailstore/LocalTextBody.java

@@ -1,4 +1,4 @@
-package com.fsck.k9.local;
+package com.fsck.k9.mailstore;
 
 import com.fsck.k9.mail.internet.TextBody;
 

src/com/fsck/k9/mailstore/LockableDatabase.java

@@ -1,4 +1,4 @@
-package com.fsck.k9.local;
+package com.fsck.k9.mailstore;
 
 import java.io.File;
 import java.util.concurrent.locks.Lock;
@@ -34,7 +34,7 @@ public class LockableDatabase {
          * @return Any relevant data. Can be <code>null</code>.
          * @throws WrappedException
          * @throws com.fsck.k9.mail.MessagingException
-         * @throws com.fsck.k9.local.UnavailableStorageException
+         * @throws com.fsck.k9.mailstore.UnavailableStorageException
          */
         T doDbWork(SQLiteDatabase db) throws WrappedException, MessagingException;
     }

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

@@ -1,4 +1,4 @@
-package com.fsck.k9.local;
+package com.fsck.k9.mailstore;
 
 import com.fsck.k9.mail.Message;
 

src/com/fsck/k9/mailstore/StorageManager.java

@@ -1,4 +1,4 @@
-package com.fsck.k9.local;
+package com.fsck.k9.mailstore;
 
 import java.io.File;
 import java.io.IOException;

src/com/fsck/k9/mailstore/StoreSchemaDefinition.java

@@ -1,4 +1,4 @@
-package com.fsck.k9.local;
+package com.fsck.k9.mailstore;
 
 import java.util.ArrayList;
 import java.util.List;

src/com/fsck/k9/mailstore/TempFileBody.java

@@ -1,4 +1,4 @@
-package com.fsck.k9.local;
+package com.fsck.k9.mailstore;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;

src/com/fsck/k9/mailstore/TempFileMessageBody.java

@@ -1,4 +1,4 @@
-package com.fsck.k9.local;
+package com.fsck.k9.mailstore;
 
 import java.io.IOException;
 import java.io.OutputStream;

src/com/fsck/k9/mailstore/ThreadInfo.java

@@ -1,4 +1,4 @@
-package com.fsck.k9.local;
+package com.fsck.k9.mailstore;
 
 class ThreadInfo {
     public final long threadId;

src/com/fsck/k9/mailstore/UnavailableStorageException.java

@@ -1,4 +1,4 @@
-package com.fsck.k9.local;
+package com.fsck.k9.mailstore;
 
 import com.fsck.k9.mail.MessagingException;
 

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

@@ -13,7 +13,7 @@ import com.fsck.k9.Account.SortType;
 import com.fsck.k9.K9;
 import com.fsck.k9.R;
 import com.fsck.k9.Account.FolderMode;
-import com.fsck.k9.local.StorageManager;
+import com.fsck.k9.mailstore.StorageManager;
 import com.fsck.k9.preferences.Settings.*;
 
 public class AccountSettings {

src/com/fsck/k9/provider/AttachmentProvider.java

@@ -15,9 +15,9 @@ import com.fsck.k9.K9;
 import com.fsck.k9.Preferences;
 import com.fsck.k9.mail.MessagingException;
 import com.fsck.k9.mail.internet.MimeUtility;
-import com.fsck.k9.local.LocalStore;
+import com.fsck.k9.mailstore.LocalStore;
-import com.fsck.k9.local.LocalStore.AttachmentInfo;
+import com.fsck.k9.mailstore.LocalStore.AttachmentInfo;
-import com.fsck.k9.local.StorageManager;
+import com.fsck.k9.mailstore.StorageManager;
 
 import java.io.*;
 import java.util.List;

src/com/fsck/k9/provider/EmailProvider.java

@@ -10,11 +10,11 @@ import com.fsck.k9.Preferences;
 import com.fsck.k9.cache.EmailProviderCacheCursor;
 import com.fsck.k9.helper.Utility;
 import com.fsck.k9.mail.MessagingException;
-import com.fsck.k9.local.LockableDatabase;
+import com.fsck.k9.mailstore.LockableDatabase;
-import com.fsck.k9.local.LockableDatabase.DbCallback;
+import com.fsck.k9.mailstore.LockableDatabase.DbCallback;
-import com.fsck.k9.local.LockableDatabase.WrappedException;
+import com.fsck.k9.mailstore.LockableDatabase.WrappedException;
-import com.fsck.k9.local.UnavailableStorageException;
+import com.fsck.k9.mailstore.UnavailableStorageException;
-import com.fsck.k9.local.LocalStore;
+import com.fsck.k9.mailstore.LocalStore;
 import com.fsck.k9.search.SqlQueryBuilder;
 
 import android.content.ContentProvider;

src/com/fsck/k9/provider/MessageProvider.java

@@ -32,9 +32,9 @@ import com.fsck.k9.mail.Flag;
 import com.fsck.k9.mail.Folder;
 import com.fsck.k9.mail.Message;
 import com.fsck.k9.mail.MessagingException;
-import com.fsck.k9.local.LocalFolder;
+import com.fsck.k9.mailstore.LocalFolder;
-import com.fsck.k9.local.LocalMessage;
+import com.fsck.k9.mailstore.LocalMessage;
-import com.fsck.k9.local.LocalStore;
+import com.fsck.k9.mailstore.LocalStore;
 import com.fsck.k9.search.SearchAccount;
 
 import java.lang.ref.WeakReference;

src/com/fsck/k9/search/SqlQueryBuilder.java

@@ -5,8 +5,8 @@ import java.util.List;
 import com.fsck.k9.Account;
 import com.fsck.k9.mail.MessagingException;
 import com.fsck.k9.mail.Folder;
-import com.fsck.k9.local.LocalFolder;
+import com.fsck.k9.mailstore.LocalFolder;
-import com.fsck.k9.local.LocalStore;
+import com.fsck.k9.mailstore.LocalStore;
 import com.fsck.k9.search.SearchSpecification.Attribute;
 import com.fsck.k9.search.SearchSpecification.SearchCondition;
 import com.fsck.k9.search.SearchSpecification.Searchfield;

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

@@ -17,7 +17,7 @@ import com.fsck.k9.Preferences;
 import com.fsck.k9.activity.UpgradeDatabases;
 import com.fsck.k9.helper.power.TracingPowerManager;
 import com.fsck.k9.helper.power.TracingPowerManager.TracingWakeLock;
-import com.fsck.k9.local.UnavailableStorageException;
+import com.fsck.k9.mailstore.UnavailableStorageException;
 
 /**
  * Service used to upgrade the accounts' databases and/or track the progress of the upgrade.

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

@@ -11,7 +11,7 @@ import com.fsck.k9.activity.MessageCompose;
 import com.fsck.k9.activity.MessageReference;
 import com.fsck.k9.controller.MessagingController;
 import com.fsck.k9.mail.Flag;
-import com.fsck.k9.local.LocalMessage;
+import com.fsck.k9.mailstore.LocalMessage;
 
 import android.app.PendingIntent;
 import android.content.Context;

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

@@ -7,7 +7,7 @@ import android.net.Uri;
 import android.util.Log;
 
 import com.fsck.k9.K9;
-import com.fsck.k9.local.StorageManager;
+import com.fsck.k9.mailstore.StorageManager;
 
 /**
  * That BroadcastReceiver is only interested in UNMOUNT events.

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

@@ -7,7 +7,7 @@ import android.net.Uri;
 import android.util.Log;
 
 import com.fsck.k9.K9;
-import com.fsck.k9.local.StorageManager;
+import com.fsck.k9.mailstore.StorageManager;
 
 /**
  * That BroadcastReceiver is only interested in MOUNT events.

src/com/fsck/k9/view/AttachmentView.java

@@ -43,7 +43,7 @@ import com.fsck.k9.mail.MessagingException;
 import com.fsck.k9.mail.Part;
 import com.fsck.k9.mail.internet.MimeHeader;
 import com.fsck.k9.mail.internet.MimeUtility;
-import com.fsck.k9.local.LocalAttachmentBodyPart;
+import com.fsck.k9.mailstore.LocalAttachmentBodyPart;
 import com.fsck.k9.provider.AttachmentProvider;
 import org.apache.commons.io.IOUtils;
 

src/com/fsck/k9/view/SingleMessageView.java

@@ -56,8 +56,8 @@ import com.fsck.k9.mail.MessagingException;
 import com.fsck.k9.mail.Multipart;
 import com.fsck.k9.mail.Part;
 import com.fsck.k9.mail.internet.MimeUtility;
-import com.fsck.k9.local.LocalAttachmentBodyPart;
+import com.fsck.k9.mailstore.LocalAttachmentBodyPart;
-import com.fsck.k9.local.LocalMessage;
+import com.fsck.k9.mailstore.LocalMessage;
 import com.fsck.k9.provider.AttachmentProvider.AttachmentProviderColumns;
 
 import org.apache.commons.io.IOUtils;