diff --git a/CHANGES b/CHANGES
index d4640d922..c74de0c9b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,7 @@
   * Remove duplicates for call log restoring (#479)
   * New launcher icons (Shimon Simon)
   * Bug fixes (#347 #391 #409)
+  * Upgraded k9-mail
 
 == 1.5.5 (1531) 07-16-2013
 
diff --git a/pom.xml b/pom.xml
index c649e13b6..0ba70baad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,10 +38,11 @@
         </dependency>
 
         <dependency>
+            <!-- https://github.com/jberkel/k-9/tree/sms-backup-plus -->
             <groupId>com.fsck.k9.mail</groupId>
             <artifactId>lib</artifactId>
             <type>aar</type>
-            <version>0.0.1.e3eab38</version>
+            <version>0.0.1.56c26ee</version>
         </dependency>
 
         <dependency>
diff --git a/src/test/java/com/zegoggles/smssync/service/RestoreTaskTest.java b/src/test/java/com/zegoggles/smssync/service/RestoreTaskTest.java
index dac8f8e57..a059886fc 100644
--- a/src/test/java/com/zegoggles/smssync/service/RestoreTaskTest.java
+++ b/src/test/java/com/zegoggles/smssync/service/RestoreTaskTest.java
@@ -5,8 +5,8 @@
 import android.content.ContentValues;
 import android.content.Context;
 import android.net.Uri;
-import com.fsck.k9.mail.Message;
 import com.fsck.k9.mail.MessagingException;
+import com.fsck.k9.mail.store.imap.ImapStore;
 import com.zegoggles.smssync.Consts;
 import com.zegoggles.smssync.SmsConsts;
 import com.zegoggles.smssync.auth.TokenRefresher;
@@ -29,7 +29,9 @@
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyBoolean;
 import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 import static org.mockito.MockitoAnnotations.initMocks;
 
 @RunWith(RobolectricTestRunner.class)
@@ -77,12 +79,12 @@ public void before() throws MessagingException {
     @Test
     public void shouldRestoreItems() throws Exception {
         Date now = new Date();
-        List<Message> messages = new ArrayList<Message>();
+        List<ImapStore.ImapMessage> messages = new ArrayList<ImapStore.ImapMessage>();
         ContentValues values = new ContentValues();
         values.put(SmsConsts.TYPE, SmsConsts.MESSAGE_TYPE_INBOX);
         values.put(SmsConsts.DATE, now.getTime());
 
-        Message mockMessage = mock(Message.class);
+        ImapStore.ImapMessage mockMessage = mock(ImapStore.ImapMessage.class);
         when(mockMessage.getFolder()).thenReturn(folder);
         when(converter.getDataType(mockMessage)).thenReturn(DataType.SMS);
         when(converter.messageToContentValues(mockMessage)).thenReturn(values);