diff --git a/.build.yml b/.build.yml
index d04eab9..49fb917 100644
--- a/.build.yml
+++ b/.build.yml
@@ -3,7 +3,7 @@ packages:
 - go
 - scdoc
 sources:
-- https://git.sr.ht/~sircmpwn/aerc
+- https://git.sr.ht/~rjarry/aerc
 tasks:
 - build: |
     cd aerc
diff --git a/aerc.go b/aerc.go
index 6e1cb8a..b3338ba 100644
--- a/aerc.go
+++ b/aerc.go
@@ -14,17 +14,17 @@ import (
 	"git.sr.ht/~sircmpwn/getopt"
 	"github.com/mattn/go-isatty"
 
-	"git.sr.ht/~sircmpwn/aerc/commands"
-	"git.sr.ht/~sircmpwn/aerc/commands/account"
-	"git.sr.ht/~sircmpwn/aerc/commands/compose"
-	"git.sr.ht/~sircmpwn/aerc/commands/msg"
-	"git.sr.ht/~sircmpwn/aerc/commands/msgview"
-	"git.sr.ht/~sircmpwn/aerc/commands/terminal"
-	"git.sr.ht/~sircmpwn/aerc/config"
-	"git.sr.ht/~sircmpwn/aerc/lib"
-	"git.sr.ht/~sircmpwn/aerc/lib/templates"
-	libui "git.sr.ht/~sircmpwn/aerc/lib/ui"
-	"git.sr.ht/~sircmpwn/aerc/widgets"
+	"git.sr.ht/~rjarry/aerc/commands"
+	"git.sr.ht/~rjarry/aerc/commands/account"
+	"git.sr.ht/~rjarry/aerc/commands/compose"
+	"git.sr.ht/~rjarry/aerc/commands/msg"
+	"git.sr.ht/~rjarry/aerc/commands/msgview"
+	"git.sr.ht/~rjarry/aerc/commands/terminal"
+	"git.sr.ht/~rjarry/aerc/config"
+	"git.sr.ht/~rjarry/aerc/lib"
+	"git.sr.ht/~rjarry/aerc/lib/templates"
+	libui "git.sr.ht/~rjarry/aerc/lib/ui"
+	"git.sr.ht/~rjarry/aerc/widgets"
 )
 
 func getCommands(selected libui.Drawable) []*commands.Commands {
diff --git a/commands/account/account.go b/commands/account/account.go
index 9c90087..4731c19 100644
--- a/commands/account/account.go
+++ b/commands/account/account.go
@@ -1,7 +1,7 @@
 package account
 
 import (
-	"git.sr.ht/~sircmpwn/aerc/commands"
+	"git.sr.ht/~rjarry/aerc/commands"
 )
 
 var (
diff --git a/commands/account/cf.go b/commands/account/cf.go
index 65b8810..ad93fdf 100644
--- a/commands/account/cf.go
+++ b/commands/account/cf.go
@@ -4,8 +4,8 @@ import (
 	"errors"
 	"strings"
 
-	"git.sr.ht/~sircmpwn/aerc/commands"
-	"git.sr.ht/~sircmpwn/aerc/widgets"
+	"git.sr.ht/~rjarry/aerc/commands"
+	"git.sr.ht/~rjarry/aerc/widgets"
 )
 
 var (
diff --git a/commands/account/clear.go b/commands/account/clear.go
index 838bfcc..3fecc13 100644
--- a/commands/account/clear.go
+++ b/commands/account/clear.go
@@ -2,7 +2,7 @@ package account
 
 import (
 	"errors"
-	"git.sr.ht/~sircmpwn/aerc/widgets"
+	"git.sr.ht/~rjarry/aerc/widgets"
 	"time"
 )
 
diff --git a/commands/account/compose.go b/commands/account/compose.go
index b33acf5..f48fa69 100644
--- a/commands/account/compose.go
+++ b/commands/account/compose.go
@@ -5,8 +5,8 @@ import (
 	"regexp"
 	"strings"
 
-	"git.sr.ht/~sircmpwn/aerc/models"
-	"git.sr.ht/~sircmpwn/aerc/widgets"
+	"git.sr.ht/~rjarry/aerc/models"
+	"git.sr.ht/~rjarry/aerc/widgets"
 	"git.sr.ht/~sircmpwn/getopt"
 )
 
diff --git a/commands/account/mkdir.go b/commands/account/mkdir.go
index d3a6226..8a260c0 100644
--- a/commands/account/mkdir.go
+++ b/commands/account/mkdir.go
@@ -5,8 +5,8 @@ import (
 	"strings"
 	"time"
 
-	"git.sr.ht/~sircmpwn/aerc/widgets"
-	"git.sr.ht/~sircmpwn/aerc/worker/types"
+	"git.sr.ht/~rjarry/aerc/widgets"
+	"git.sr.ht/~rjarry/aerc/worker/types"
 )
 
 type MakeDir struct{}
diff --git a/commands/account/next-folder.go b/commands/account/next-folder.go
index 037cd31..e3541e5 100644
--- a/commands/account/next-folder.go
+++ b/commands/account/next-folder.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"strconv"
 
-	"git.sr.ht/~sircmpwn/aerc/widgets"
+	"git.sr.ht/~rjarry/aerc/widgets"
 )
 
 type NextPrevFolder struct{}
diff --git a/commands/account/next-result.go b/commands/account/next-result.go
index fe835ea..daa7af3 100644
--- a/commands/account/next-result.go
+++ b/commands/account/next-result.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"fmt"
 
-	"git.sr.ht/~sircmpwn/aerc/widgets"
+	"git.sr.ht/~rjarry/aerc/widgets"
 )
 
 type NextPrevResult struct{}
diff --git a/commands/account/next.go b/commands/account/next.go
index 427f563..c9c2680 100644
--- a/commands/account/next.go
+++ b/commands/account/next.go
@@ -6,7 +6,7 @@ import (
 	"strconv"
 	"strings"
 
-	"git.sr.ht/~sircmpwn/aerc/widgets"
+	"git.sr.ht/~rjarry/aerc/widgets"
 )
 
 type NextPrevMsg struct{}
diff --git a/commands/account/rmdir.go b/commands/account/rmdir.go
index 9cd974f..be49377 100644
--- a/commands/account/rmdir.go
+++ b/commands/account/rmdir.go
@@ -6,8 +6,8 @@ import (
 
 	"git.sr.ht/~sircmpwn/getopt"
 
-	"git.sr.ht/~sircmpwn/aerc/widgets"
-	"git.sr.ht/~sircmpwn/aerc/worker/types"
+	"git.sr.ht/~rjarry/aerc/widgets"
+	"git.sr.ht/~rjarry/aerc/worker/types"
 )
 
 type RemoveDir struct{}
diff --git a/commands/account/search.go b/commands/account/search.go
index 607dc24..9a9244d 100644
--- a/commands/account/search.go
+++ b/commands/account/search.go
@@ -3,7 +3,7 @@ package account
 import (
 	"errors"
 
-	"git.sr.ht/~sircmpwn/aerc/widgets"
+	"git.sr.ht/~rjarry/aerc/widgets"
 )
 
 type SearchFilter struct{}
diff --git a/commands/account/select.go b/commands/account/select.go
index b41b234..28aedfa 100644
--- a/commands/account/select.go
+++ b/commands/account/select.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"strconv"
 
-	"git.sr.ht/~sircmpwn/aerc/widgets"
+	"git.sr.ht/~rjarry/aerc/widgets"
 )
 
 type SelectMessage struct{}
diff --git a/commands/account/sort.go b/commands/account/sort.go
index 6202578..89a5e38 100644
--- a/commands/account/sort.go
+++ b/commands/account/sort.go
@@ -4,8 +4,8 @@ import (
 	"errors"
 	"strings"
 
-	"git.sr.ht/~sircmpwn/aerc/lib/sort"
-	"git.sr.ht/~sircmpwn/aerc/widgets"
+	"git.sr.ht/~rjarry/aerc/lib/sort"
+	"git.sr.ht/~rjarry/aerc/widgets"
 )
 
 type Sort struct{}
diff --git a/commands/account/view.go b/commands/account/view.go
index d52ce5b..4f59d94 100644
--- a/commands/account/view.go
+++ b/commands/account/view.go
@@ -3,8 +3,8 @@ package account
 import (
 	"errors"
 
-	"git.sr.ht/~sircmpwn/aerc/lib"
-	"git.sr.ht/~sircmpwn/aerc/widgets"
+	"git.sr.ht/~rjarry/aerc/lib"
+	"git.sr.ht/~rjarry/aerc/widgets"
 )
 
 type ViewMessage struct{}
diff --git a/commands/cd.go b/commands/cd.go
index fa487e7..edfc179 100644
--- a/commands/cd.go
+++ b/commands/cd.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"strings"
 
-	"git.sr.ht/~sircmpwn/aerc/widgets"
+	"git.sr.ht/~rjarry/aerc/widgets"
 	"github.com/mitchellh/go-homedir"
 )
 
diff --git a/commands/choose.go b/commands/choose.go
index 6fa91be..3b3af79 100644
--- a/commands/choose.go
+++ b/commands/choose.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"git.sr.ht/~sircmpwn/aerc/widgets"
+	"git.sr.ht/~rjarry/aerc/widgets"
 )
 
 type Choose struct{}
diff --git a/commands/commands.go b/commands/commands.go
index 0c761d1..3777835 100644
--- a/commands/commands.go
+++ b/commands/commands.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/google/shlex"
 
-	"git.sr.ht/~sircmpwn/aerc/widgets"
+	"git.sr.ht/~rjarry/aerc/widgets"
 )
 
 type Command interface {
diff --git a/commands/compose/abort.go b/commands/compose/abort.go
index 74d0395..d4a4699 100644
--- a/commands/compose/abort.go
+++ b/commands/compose/abort.go
@@ -3,7 +3,7 @@ package compose
 import (
 	"errors"
 
-	"git.sr.ht/~sircmpwn/aerc/widgets"
+	"git.sr.ht/~rjarry/aerc/widgets"
 )
 
 type Abort struct{}
diff --git a/commands/compose/attach.go b/commands/compose/attach.go
index 37f49df..50abda5 100644
--- a/commands/compose/attach.go
+++ b/commands/compose/attach.go
@@ -5,8 +5,8 @@ import (
 	"os"
 	"strings"
 
-	"git.sr.ht/~sircmpwn/aerc/commands"
-	"git.sr.ht/~sircmpwn/aerc/widgets"
+	"git.sr.ht/~rjarry/aerc/commands"
+	"git.sr.ht/~rjarry/aerc/widgets"
 	"github.com/mitchellh/go-homedir"
 )
 
diff --git a/commands/compose/cc-bcc.go b/commands/compose/cc-bcc.go
index ce62242..5540f83 100644
--- a/commands/compose/cc-bcc.go
+++ b/commands/compose/cc-bcc.go
@@ -3,7 +3,7 @@ package compose
 import (
 	"strings"
 
-	"git.sr.ht/~sircmpwn/aerc/widgets"
+	"git.sr.ht/~rjarry/aerc/widgets"
 )
 
 type CC struct{}
diff --git a/commands/compose/compose.go b/commands/compose/compose.go
index d61696e..563dcd1 100644
--- a/commands/compose/compose.go
+++ b/commands/compose/compose.go
@@ -1,7 +1,7 @@
 package compose
 
 import (
-	"git.sr.ht/~sircmpwn/aerc/commands"
+	"git.sr.ht/~rjarry/aerc/commands"
 )
 
 var (
diff --git a/commands/compose/detach.go b/commands/compose/detach.go
index b48159d..31ac082 100644
--- a/commands/compose/detach.go
+++ b/commands/compose/detach.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"git.sr.ht/~sircmpwn/aerc/widgets"
+	"git.sr.ht/~rjarry/aerc/widgets"
 )
 
 type Detach struct{}
diff --git a/commands/compose/edit.go b/commands/compose/edit.go
index e788022..375f361 100644
--- a/commands/compose/edit.go
+++ b/commands/compose/edit.go
@@ -3,7 +3,7 @@ package compose
 import (
 	"errors"
 
-	"git.sr.ht/~sircmpwn/aerc/widgets"
+	"git.sr.ht/~rjarry/aerc/widgets"
 )
 
 type Edit struct{}
diff --git a/commands/compose/header.go b/commands/compose/header.go
index e4d7c40..5780aa8 100644
--- a/commands/compose/header.go
+++ b/commands/compose/header.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"strings"
 
-	"git.sr.ht/~sircmpwn/aerc/commands"
-	"git.sr.ht/~sircmpwn/aerc/widgets"
+	"git.sr.ht/~rjarry/aerc/commands"
+	"git.sr.ht/~rjarry/aerc/widgets"
 	"git.sr.ht/~sircmpwn/getopt"
 )
 
diff --git a/commands/compose/next-field.go b/commands/compose/next-field.go
index a81852e..69b33e5 100644
--- a/commands/compose/next-field.go
+++ b/commands/compose/next-field.go
@@ -3,7 +3,7 @@ package compose
 import (
 	"fmt"
 
-	"git.sr.ht/~sircmpwn/aerc/widgets"
+	"git.sr.ht/~rjarry/aerc/widgets"
 )
 
 type NextPrevField struct{}
diff --git a/commands/compose/postpone.go b/commands/compose/postpone.go
index 6d6c8e7..03a8608 100644
--- a/commands/compose/postpone.go
+++ b/commands/compose/postpone.go
@@ -8,9 +8,9 @@ import (
 	"github.com/miolini/datacounter"
 	"github.com/pkg/errors"
 
-	"git.sr.ht/~sircmpwn/aerc/models"
-	"git.sr.ht/~sircmpwn/aerc/widgets"
-	"git.sr.ht/~sircmpwn/aerc/worker/types"
+	"git.sr.ht/~rjarry/aerc/models"
+	"git.sr.ht/~rjarry/aerc/widgets"
+	"git.sr.ht/~rjarry/aerc/worker/types"
 )
 
 type Postpone struct{}
diff --git a/commands/compose/send.go b/commands/compose/send.go
index 849182d..12bf155 100644
--- a/commands/compose/send.go
+++ b/commands/compose/send.go
@@ -15,10 +15,10 @@ import (
 	"github.com/google/shlex"
 	"github.com/pkg/errors"
 
-	"git.sr.ht/~sircmpwn/aerc/lib"
-	"git.sr.ht/~sircmpwn/aerc/models"
-	"git.sr.ht/~sircmpwn/aerc/widgets"
-	"git.sr.ht/~sircmpwn/aerc/worker/types"
+	"git.sr.ht/~rjarry/aerc/lib"
+	"git.sr.ht/~rjarry/aerc/models"
+	"git.sr.ht/~rjarry/aerc/widgets"
+	"git.sr.ht/~rjarry/aerc/worker/types"
 	"github.com/emersion/go-message/mail"
 	"golang.org/x/oauth2"
 )
diff --git a/commands/ct.go b/commands/ct.go
index 8b6e8a8..7764cab 100644
--- a/commands/ct.go
+++ b/commands/ct.go
@@ -6,7 +6,7 @@ import (
 	"strconv"
 	"strings"
 
-	"git.sr.ht/~sircmpwn/aerc/widgets"
+	"git.sr.ht/~rjarry/aerc/widgets"
 )
 
 type ChangeTab struct{}
diff --git a/commands/exec.go b/commands/exec.go
index b1966c2..317bf07 100644
--- a/commands/exec.go
+++ b/commands/exec.go
@@ -7,7 +7,7 @@ import (
 	"os/exec"
 	"time"
 
-	"git.sr.ht/~sircmpwn/aerc/widgets"
+	"git.sr.ht/~rjarry/aerc/widgets"
 )
 
 type ExecCmd struct{}
diff --git a/commands/help.go b/commands/help.go
index b27c2f0..5bc8f0e 100644
--- a/commands/help.go
+++ b/commands/help.go
@@ -3,7 +3,7 @@ package commands
 import (
 	"errors"
 
-	"git.sr.ht/~sircmpwn/aerc/widgets"
+	"git.sr.ht/~rjarry/aerc/widgets"
 )
 
 type Help struct{}
diff --git a/commands/move-tab.go b/commands/move-tab.go
index 9f0293c..4151bd7 100644
--- a/commands/move-tab.go
+++ b/commands/move-tab.go
@@ -5,7 +5,7 @@ import (
 	"strconv"
 	"strings"
 
-	"git.sr.ht/~sircmpwn/aerc/widgets"
+	"git.sr.ht/~rjarry/aerc/widgets"
 )
 
 type MoveTab struct{}
diff --git a/commands/msg/archive.go b/commands/msg/archive.go
index 59ca985..e73e42c 100644
--- a/commands/msg/archive.go
+++ b/commands/msg/archive.go
@@ -7,10 +7,10 @@ import (
 	"sync"
 	"time"
 
-	"git.sr.ht/~sircmpwn/aerc/commands"
-	"git.sr.ht/~sircmpwn/aerc/models"
-	"git.sr.ht/~sircmpwn/aerc/widgets"
-	"git.sr.ht/~sircmpwn/aerc/worker/types"
+	"git.sr.ht/~rjarry/aerc/commands"
+	"git.sr.ht/~rjarry/aerc/models"
+	"git.sr.ht/~rjarry/aerc/widgets"
+	"git.sr.ht/~rjarry/aerc/worker/types"
 )
 
 const (
diff --git a/commands/msg/copy.go b/commands/msg/copy.go
index 8e5bad0..3b3dd72 100644
--- a/commands/msg/copy.go
+++ b/commands/msg/copy.go
@@ -7,9 +7,9 @@ import (
 
 	"git.sr.ht/~sircmpwn/getopt"
 
-	"git.sr.ht/~sircmpwn/aerc/commands"
-	"git.sr.ht/~sircmpwn/aerc/widgets"
-	"git.sr.ht/~sircmpwn/aerc/worker/types"
+	"git.sr.ht/~rjarry/aerc/commands"
+	"git.sr.ht/~rjarry/aerc/widgets"
+	"git.sr.ht/~rjarry/aerc/worker/types"
 )
 
 type Copy struct{}
diff --git a/commands/msg/delete.go b/commands/msg/delete.go
index 677a666..34eac72 100644
--- a/commands/msg/delete.go
+++ b/commands/msg/delete.go
@@ -4,10 +4,10 @@ import (
 	"errors"
 	"time"
 
-	"git.sr.ht/~sircmpwn/aerc/lib"
-	"git.sr.ht/~sircmpwn/aerc/models"
-	"git.sr.ht/~sircmpwn/aerc/widgets"
-	"git.sr.ht/~sircmpwn/aerc/worker/types"
+	"git.sr.ht/~rjarry/aerc/lib"
+	"git.sr.ht/~rjarry/aerc/models"
+	"git.sr.ht/~rjarry/aerc/widgets"
+	"git.sr.ht/~rjarry/aerc/worker/types"
 )
 
 type Delete struct{}
diff --git a/commands/msg/forward.go b/commands/msg/forward.go
index ec89bfa..9cc13c0 100644
--- a/commands/msg/forward.go
+++ b/commands/msg/forward.go
@@ -10,11 +10,11 @@ import (
 	"path"
 	"strings"
 
-	"git.sr.ht/~sircmpwn/aerc/lib"
-	"git.sr.ht/~sircmpwn/aerc/lib/format"
-	"git.sr.ht/~sircmpwn/aerc/models"
-	"git.sr.ht/~sircmpwn/aerc/widgets"
-	"git.sr.ht/~sircmpwn/aerc/worker/types"
+	"git.sr.ht/~rjarry/aerc/lib"
+	"git.sr.ht/~rjarry/aerc/lib/format"
+	"git.sr.ht/~rjarry/aerc/models"
+	"git.sr.ht/~rjarry/aerc/widgets"
+	"git.sr.ht/~rjarry/aerc/worker/types"
 	"github.com/emersion/go-message/mail"
 
 	"git.sr.ht/~sircmpwn/getopt"
diff --git a/commands/msg/mark.go b/commands/msg/mark.go
index 3955f4a..d6beae4 100644
--- a/commands/msg/mark.go
+++ b/commands/msg/mark.go
@@ -3,7 +3,7 @@ package msg
 import (
 	"fmt"
 
-	"git.sr.ht/~sircmpwn/aerc/widgets"
+	"git.sr.ht/~rjarry/aerc/widgets"
 	"git.sr.ht/~sircmpwn/getopt"
 )
 
diff --git a/commands/msg/modify-labels.go b/commands/msg/modify-labels.go
index 082742b..ca3ccf7 100644
--- a/commands/msg/modify-labels.go
+++ b/commands/msg/modify-labels.go
@@ -4,9 +4,9 @@ import (
 	"errors"
 	"time"
 
-	"git.sr.ht/~sircmpwn/aerc/commands"
-	"git.sr.ht/~sircmpwn/aerc/widgets"
-	"git.sr.ht/~sircmpwn/aerc/worker/types"
+	"git.sr.ht/~rjarry/aerc/commands"
+	"git.sr.ht/~rjarry/aerc/widgets"
+	"git.sr.ht/~rjarry/aerc/worker/types"
 )
 
 type ModifyLabels struct{}
diff --git a/commands/msg/move.go b/commands/msg/move.go
index 31e243a..098227e 100644
--- a/commands/msg/move.go
+++ b/commands/msg/move.go
@@ -7,9 +7,9 @@ import (
 
 	"git.sr.ht/~sircmpwn/getopt"
 
-	"git.sr.ht/~sircmpwn/aerc/commands"
-	"git.sr.ht/~sircmpwn/aerc/widgets"
-	"git.sr.ht/~sircmpwn/aerc/worker/types"
+	"git.sr.ht/~rjarry/aerc/commands"
+	"git.sr.ht/~rjarry/aerc/widgets"
+	"git.sr.ht/~rjarry/aerc/worker/types"
 )
 
 type Move struct{}
diff --git a/commands/msg/msg.go b/commands/msg/msg.go
index ecf2102..7b6fb12 100644
--- a/commands/msg/msg.go
+++ b/commands/msg/msg.go
@@ -1,7 +1,7 @@
 package msg
 
 import (
-	"git.sr.ht/~sircmpwn/aerc/commands"
+	"git.sr.ht/~rjarry/aerc/commands"
 )
 
 var (
diff --git a/commands/msg/pipe.go b/commands/msg/pipe.go
index 0e22fd0..58764fb 100644
--- a/commands/msg/pipe.go
+++ b/commands/msg/pipe.go
@@ -7,9 +7,9 @@ import (
 	"os/exec"
 	"time"
 
-	"git.sr.ht/~sircmpwn/aerc/commands"
-	"git.sr.ht/~sircmpwn/aerc/widgets"
-	"git.sr.ht/~sircmpwn/aerc/worker/types"
+	"git.sr.ht/~rjarry/aerc/commands"
+	"git.sr.ht/~rjarry/aerc/widgets"
+	"git.sr.ht/~rjarry/aerc/worker/types"
 
 	"git.sr.ht/~sircmpwn/getopt"
 )
diff --git a/commands/msg/read.go b/commands/msg/read.go
index 95becf7..d2484d4 100644
--- a/commands/msg/read.go
+++ b/commands/msg/read.go
@@ -7,10 +7,10 @@ import (
 
 	"git.sr.ht/~sircmpwn/getopt"
 
-	"git.sr.ht/~sircmpwn/aerc/lib"
-	"git.sr.ht/~sircmpwn/aerc/models"
-	"git.sr.ht/~sircmpwn/aerc/widgets"
-	"git.sr.ht/~sircmpwn/aerc/worker/types"
+	"git.sr.ht/~rjarry/aerc/lib"
+	"git.sr.ht/~rjarry/aerc/models"
+	"git.sr.ht/~rjarry/aerc/widgets"
+	"git.sr.ht/~rjarry/aerc/worker/types"
 )
 
 type FlagMsg struct{}
diff --git a/commands/msg/recall.go b/commands/msg/recall.go
index 44f8ddf..61c4c39 100644
--- a/commands/msg/recall.go
+++ b/commands/msg/recall.go
@@ -8,10 +8,10 @@ import (
 	"github.com/emersion/go-message/mail"
 	"github.com/pkg/errors"
 
-	"git.sr.ht/~sircmpwn/aerc/lib"
-	"git.sr.ht/~sircmpwn/aerc/models"
-	"git.sr.ht/~sircmpwn/aerc/widgets"
-	"git.sr.ht/~sircmpwn/aerc/worker/types"
+	"git.sr.ht/~rjarry/aerc/lib"
+	"git.sr.ht/~rjarry/aerc/models"
+	"git.sr.ht/~rjarry/aerc/widgets"
+	"git.sr.ht/~rjarry/aerc/worker/types"
 )
 
 type Recall struct{}
diff --git a/commands/msg/reply.go b/commands/msg/reply.go
index 2e4a21a..8b21995 100644
--- a/commands/msg/reply.go
+++ b/commands/msg/reply.go
@@ -9,10 +9,10 @@ import (
 
 	"git.sr.ht/~sircmpwn/getopt"
 
-	"git.sr.ht/~sircmpwn/aerc/lib"
-	"git.sr.ht/~sircmpwn/aerc/lib/format"
-	"git.sr.ht/~sircmpwn/aerc/models"
-	"git.sr.ht/~sircmpwn/aerc/widgets"
+	"git.sr.ht/~rjarry/aerc/lib"
+	"git.sr.ht/~rjarry/aerc/lib/format"
+	"git.sr.ht/~rjarry/aerc/models"
+	"git.sr.ht/~rjarry/aerc/widgets"
 	"github.com/emersion/go-message/mail"
 )
 
diff --git a/commands/msg/unsubscribe.go b/commands/msg/unsubscribe.go
index cf3e4a8..a489ec5 100644
--- a/commands/msg/unsubscribe.go
+++ b/commands/msg/unsubscribe.go
@@ -6,9 +6,9 @@ import (
 	"net/url"
 	"strings"
 
-	"git.sr.ht/~sircmpwn/aerc/lib"
-	"git.sr.ht/~sircmpwn/aerc/models"
-	"git.sr.ht/~sircmpwn/aerc/widgets"
+	"git.sr.ht/~rjarry/aerc/lib"
+	"git.sr.ht/~rjarry/aerc/models"
+	"git.sr.ht/~rjarry/aerc/widgets"
 	"github.com/emersion/go-message/mail"
 )
 
diff --git a/commands/msg/utils.go b/commands/msg/utils.go
index cad0f82..212fc75 100644
--- a/commands/msg/utils.go
+++ b/commands/msg/utils.go
@@ -3,10 +3,10 @@ package msg
 import (
 	"errors"
 
-	"git.sr.ht/~sircmpwn/aerc/commands"
-	"git.sr.ht/~sircmpwn/aerc/lib"
-	"git.sr.ht/~sircmpwn/aerc/models"
-	"git.sr.ht/~sircmpwn/aerc/widgets"
+	"git.sr.ht/~rjarry/aerc/commands"
+	"git.sr.ht/~rjarry/aerc/lib"
+	"git.sr.ht/~rjarry/aerc/models"
+	"git.sr.ht/~rjarry/aerc/widgets"
 )
 
 type helper struct {
diff --git a/commands/msgview/close.go b/commands/msgview/close.go
index ed86405..37f66ad 100644
--- a/commands/msgview/close.go
+++ b/commands/msgview/close.go
@@ -3,7 +3,7 @@ package msgview
 import (
 	"errors"
 
-	"git.sr.ht/~sircmpwn/aerc/widgets"
+	"git.sr.ht/~rjarry/aerc/widgets"
 )
 
 type Close struct{}
diff --git a/commands/msgview/msgview.go b/commands/msgview/msgview.go
index d60549e..0f0108e 100644
--- a/commands/msgview/msgview.go
+++ b/commands/msgview/msgview.go
@@ -1,7 +1,7 @@
 package msgview
 
 import (
-	"git.sr.ht/~sircmpwn/aerc/commands"
+	"git.sr.ht/~rjarry/aerc/commands"
 )
 
 var (
diff --git a/commands/msgview/next-part.go b/commands/msgview/next-part.go
index a98e96a..f44ffab 100644
--- a/commands/msgview/next-part.go
+++ b/commands/msgview/next-part.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strconv"
 
-	"git.sr.ht/~sircmpwn/aerc/widgets"
+	"git.sr.ht/~rjarry/aerc/widgets"
 )
 
 type NextPrevPart struct{}
diff --git a/commands/msgview/next.go b/commands/msgview/next.go
index 978cf10..4291a6a 100644
--- a/commands/msgview/next.go
+++ b/commands/msgview/next.go
@@ -1,9 +1,9 @@
 package msgview
 
 import (
-	"git.sr.ht/~sircmpwn/aerc/commands/account"
-	"git.sr.ht/~sircmpwn/aerc/lib"
-	"git.sr.ht/~sircmpwn/aerc/widgets"
+	"git.sr.ht/~rjarry/aerc/commands/account"
+	"git.sr.ht/~rjarry/aerc/lib"
+	"git.sr.ht/~rjarry/aerc/widgets"
 )
 
 type NextPrevMsg struct{}
diff --git a/commands/msgview/open.go b/commands/msgview/open.go
index 57e7227..bcfe2b4 100644
--- a/commands/msgview/open.go
+++ b/commands/msgview/open.go
@@ -8,8 +8,8 @@ import (
 	"os"
 	"time"
 
-	"git.sr.ht/~sircmpwn/aerc/lib"
-	"git.sr.ht/~sircmpwn/aerc/widgets"
+	"git.sr.ht/~rjarry/aerc/lib"
+	"git.sr.ht/~rjarry/aerc/widgets"
 )
 
 type Open struct{}
diff --git a/commands/msgview/save.go b/commands/msgview/save.go
index 5d01e4d..713c6d1 100644
--- a/commands/msgview/save.go
+++ b/commands/msgview/save.go
@@ -12,9 +12,9 @@ import (
 	"git.sr.ht/~sircmpwn/getopt"
 	"github.com/mitchellh/go-homedir"
 
-	"git.sr.ht/~sircmpwn/aerc/commands"
-	"git.sr.ht/~sircmpwn/aerc/models"
-	"git.sr.ht/~sircmpwn/aerc/widgets"
+	"git.sr.ht/~rjarry/aerc/commands"
+	"git.sr.ht/~rjarry/aerc/models"
+	"git.sr.ht/~rjarry/aerc/widgets"
 )
 
 type Save struct{}
diff --git a/commands/msgview/toggle-headers.go b/commands/msgview/toggle-headers.go
index e777d9b..75f7e46 100644
--- a/commands/msgview/toggle-headers.go
+++ b/commands/msgview/toggle-headers.go
@@ -3,7 +3,7 @@ package msgview
 import (
 	"fmt"
 
-	"git.sr.ht/~sircmpwn/aerc/widgets"
+	"git.sr.ht/~rjarry/aerc/widgets"
 )
 
 type ToggleHeaders struct{}
diff --git a/commands/new-account.go b/commands/new-account.go
index ff585c0..77ca3f8 100644
--- a/commands/new-account.go
+++ b/commands/new-account.go
@@ -3,7 +3,7 @@ package commands
 import (
 	"errors"
 
-	"git.sr.ht/~sircmpwn/aerc/widgets"
+	"git.sr.ht/~rjarry/aerc/widgets"
 	"git.sr.ht/~sircmpwn/getopt"
 )
 
diff --git a/commands/next-tab.go b/commands/next-tab.go
index fc668f1..9d6a09b 100644
--- a/commands/next-tab.go
+++ b/commands/next-tab.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strconv"
 
-	"git.sr.ht/~sircmpwn/aerc/widgets"
+	"git.sr.ht/~rjarry/aerc/widgets"
 )
 
 type NextPrevTab struct{}
diff --git a/commands/pin-tab.go b/commands/pin-tab.go
index 164a68b..9a62661 100644
--- a/commands/pin-tab.go
+++ b/commands/pin-tab.go
@@ -3,7 +3,7 @@ package commands
 import (
 	"fmt"
 
-	"git.sr.ht/~sircmpwn/aerc/widgets"
+	"git.sr.ht/~rjarry/aerc/widgets"
 )
 
 type PinTab struct{}
diff --git a/commands/prompt.go b/commands/prompt.go
index 2d6d01d..6714eb3 100644
--- a/commands/prompt.go
+++ b/commands/prompt.go
@@ -3,7 +3,7 @@ package commands
 import (
 	"fmt"
 
-	"git.sr.ht/~sircmpwn/aerc/widgets"
+	"git.sr.ht/~rjarry/aerc/widgets"
 )
 
 type Prompt struct{}
diff --git a/commands/pwd.go b/commands/pwd.go
index d3f0e0c..624258c 100644
--- a/commands/pwd.go
+++ b/commands/pwd.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"time"
 
-	"git.sr.ht/~sircmpwn/aerc/widgets"
+	"git.sr.ht/~rjarry/aerc/widgets"
 )
 
 type PrintWorkDir struct{}
diff --git a/commands/quit.go b/commands/quit.go
index 63bc94a..fbec2b7 100644
--- a/commands/quit.go
+++ b/commands/quit.go
@@ -3,7 +3,7 @@ package commands
 import (
 	"errors"
 
-	"git.sr.ht/~sircmpwn/aerc/widgets"
+	"git.sr.ht/~rjarry/aerc/widgets"
 )
 
 type Quit struct{}
diff --git a/commands/set.go b/commands/set.go
index cc6333e..0259240 100644
--- a/commands/set.go
+++ b/commands/set.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"strings"
 
-	"git.sr.ht/~sircmpwn/aerc/widgets"
+	"git.sr.ht/~rjarry/aerc/widgets"
 
 	"github.com/go-ini/ini"
 )
diff --git a/commands/term.go b/commands/term.go
index c28c7d0..924f71c 100644
--- a/commands/term.go
+++ b/commands/term.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/riywo/loginshell"
 
-	"git.sr.ht/~sircmpwn/aerc/widgets"
+	"git.sr.ht/~rjarry/aerc/widgets"
 )
 
 type Term struct{}
diff --git a/commands/terminal/close.go b/commands/terminal/close.go
index aca0166..95ee94c 100644
--- a/commands/terminal/close.go
+++ b/commands/terminal/close.go
@@ -3,7 +3,7 @@ package terminal
 import (
 	"errors"
 
-	"git.sr.ht/~sircmpwn/aerc/widgets"
+	"git.sr.ht/~rjarry/aerc/widgets"
 )
 
 type Close struct{}
diff --git a/commands/terminal/terminal.go b/commands/terminal/terminal.go
index 710d796..c93f80e 100644
--- a/commands/terminal/terminal.go
+++ b/commands/terminal/terminal.go
@@ -1,7 +1,7 @@
 package terminal
 
 import (
-	"git.sr.ht/~sircmpwn/aerc/commands"
+	"git.sr.ht/~rjarry/aerc/commands"
 )
 
 var (
diff --git a/commands/util.go b/commands/util.go
index 8e2bdbc..ffc5ed6 100644
--- a/commands/util.go
+++ b/commands/util.go
@@ -10,9 +10,9 @@ import (
 	"strings"
 	"time"
 
-	"git.sr.ht/~sircmpwn/aerc/lib"
-	"git.sr.ht/~sircmpwn/aerc/models"
-	"git.sr.ht/~sircmpwn/aerc/widgets"
+	"git.sr.ht/~rjarry/aerc/lib"
+	"git.sr.ht/~rjarry/aerc/models"
+	"git.sr.ht/~rjarry/aerc/widgets"
 	"github.com/gdamore/tcell/v2"
 	"github.com/mitchellh/go-homedir"
 )
diff --git a/config/config.go b/config/config.go
index dfcbd4d..dcfdd24 100644
--- a/config/config.go
+++ b/config/config.go
@@ -19,7 +19,7 @@ import (
 	"github.com/imdario/mergo"
 	"github.com/kyoh86/xdg"
 
-	"git.sr.ht/~sircmpwn/aerc/lib/templates"
+	"git.sr.ht/~rjarry/aerc/lib/templates"
 )
 
 type GeneralConfig struct {
diff --git a/config/triggers.go b/config/triggers.go
index 4777371..f00f638 100644
--- a/config/triggers.go
+++ b/config/triggers.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/google/shlex"
 
-	"git.sr.ht/~sircmpwn/aerc/lib/format"
-	"git.sr.ht/~sircmpwn/aerc/models"
+	"git.sr.ht/~rjarry/aerc/lib/format"
+	"git.sr.ht/~rjarry/aerc/models"
 )
 
 func (trig *TriggersConfig) ExecTrigger(triggerCmd string,
diff --git a/doc/aerc-config.5.scd b/doc/aerc-config.5.scd
index a3130b2..2406591 100644
--- a/doc/aerc-config.5.scd
+++ b/doc/aerc-config.5.scd
@@ -650,4 +650,4 @@ following special keys are supported:
 
 Maintained by Drew DeVault <sir@cmpwn.com>, who is assisted by other open
 source contributors. For more information about aerc development, see
-https://git.sr.ht/~sircmpwn/aerc.
+https://git.sr.ht/~rjarry/aerc.
diff --git a/doc/aerc-imap.5.scd b/doc/aerc-imap.5.scd
index 4e55202..9af364c 100644
--- a/doc/aerc-imap.5.scd
+++ b/doc/aerc-imap.5.scd
@@ -69,4 +69,4 @@ available:
 
 Maintained by Drew DeVault <sir@cmpwn.com>, who is assisted by other open
 source contributors. For more information about aerc development, see
-https://git.sr.ht/~sircmpwn/aerc.
+https://git.sr.ht/~rjarry/aerc.
diff --git a/doc/aerc-maildir.5.scd b/doc/aerc-maildir.5.scd
index 37a654b..1499320 100644
--- a/doc/aerc-maildir.5.scd
+++ b/doc/aerc-maildir.5.scd
@@ -37,4 +37,4 @@ The following maildir-specific options are available:
 
 Maintained by Drew DeVault <sir@cmpwn.com>, who is assisted by other open
 source contributors. For more information about aerc development, see
-https://git.sr.ht/~sircmpwn/aerc.
+https://git.sr.ht/~rjarry/aerc.
diff --git a/doc/aerc-notmuch.5.scd b/doc/aerc-notmuch.5.scd
index eb29c53..d106900 100644
--- a/doc/aerc-notmuch.5.scd
+++ b/doc/aerc-notmuch.5.scd
@@ -72,4 +72,4 @@ Others are slightly different in semantics and mentioned below:
 
 Maintained by Drew DeVault <sir@cmpwn.com>, who is assisted by other open
 source contributors. For more information about aerc development, see
-https://git.sr.ht/~sircmpwn/aerc.
+https://git.sr.ht/~rjarry/aerc.
diff --git a/doc/aerc-sendmail.5.scd b/doc/aerc-sendmail.5.scd
index 90118fb..2f7cce1 100644
--- a/doc/aerc-sendmail.5.scd
+++ b/doc/aerc-sendmail.5.scd
@@ -28,4 +28,4 @@ options are available:
 
 Maintained by Drew DeVault <sir@cmpwn.com>, who is assisted by other open
 source contributors. For more information about aerc development, see
-https://git.sr.ht/~sircmpwn/aerc.
+https://git.sr.ht/~rjarry/aerc.
diff --git a/doc/aerc-smtp.5.scd b/doc/aerc-smtp.5.scd
index 8490c58..3d52d1b 100644
--- a/doc/aerc-smtp.5.scd
+++ b/doc/aerc-smtp.5.scd
@@ -69,4 +69,4 @@ available:
 
 Maintained by Drew DeVault <sir@cmpwn.com>, who is assisted by other open
 source contributors. For more information about aerc development, see
-https://git.sr.ht/~sircmpwn/aerc.
+https://git.sr.ht/~rjarry/aerc.
diff --git a/doc/aerc-templates.7.scd b/doc/aerc-templates.7.scd
index 1d94cf1..0fa9644 100644
--- a/doc/aerc-templates.7.scd
+++ b/doc/aerc-templates.7.scd
@@ -152,4 +152,4 @@ aerc provides the following additional functions:
 
 Maintained by Drew DeVault <sir@cmpwn.com>, who is assisted by other open
 source contributors. For more information about aerc development, see
-https://git.sr.ht/~sircmpwn/aerc.
+https://git.sr.ht/~rjarry/aerc.
diff --git a/doc/aerc-tutorial.7.scd b/doc/aerc-tutorial.7.scd
index 6f75dc4..3f6e8ba 100644
--- a/doc/aerc-tutorial.7.scd
+++ b/doc/aerc-tutorial.7.scd
@@ -152,4 +152,4 @@ change its appearance and behavior, and so on.
 
 Maintained by Drew DeVault <sir@cmpwn.com>, who is assisted by other open
 source contributors. For more information about aerc development, see
-https://git.sr.ht/~sircmpwn/aerc.
+https://git.sr.ht/~rjarry/aerc.
diff --git a/doc/aerc.1.scd b/doc/aerc.1.scd
index f678a0a..6890bac 100644
--- a/doc/aerc.1.scd
+++ b/doc/aerc.1.scd
@@ -407,4 +407,4 @@ write log messages to that file:
 
 Maintained by Drew DeVault <sir@cmpwn.com>, who is assisted by other open
 source contributors. For more information about aerc development, see
-https://git.sr.ht/~sircmpwn/aerc.
+https://git.sr.ht/~rjarry/aerc.
diff --git a/go.mod b/go.mod
index 240209d..246ca21 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module git.sr.ht/~sircmpwn/aerc
+module git.sr.ht/~rjarry/aerc
 
 go 1.13
 
diff --git a/lib/format/format.go b/lib/format/format.go
index 4ee62ac..1aba762 100644
--- a/lib/format/format.go
+++ b/lib/format/format.go
@@ -8,7 +8,7 @@ import (
 	"time"
 	"unicode"
 
-	"git.sr.ht/~sircmpwn/aerc/models"
+	"git.sr.ht/~rjarry/aerc/models"
 	"github.com/emersion/go-message/mail"
 )
 
diff --git a/lib/messageview.go b/lib/messageview.go
index 4f1d0cd..532d2c8 100644
--- a/lib/messageview.go
+++ b/lib/messageview.go
@@ -10,9 +10,9 @@ import (
 	"github.com/emersion/go-pgpmail"
 	"golang.org/x/crypto/openpgp"
 
-	"git.sr.ht/~sircmpwn/aerc/models"
-	"git.sr.ht/~sircmpwn/aerc/worker/lib"
-	"git.sr.ht/~sircmpwn/aerc/worker/types"
+	"git.sr.ht/~rjarry/aerc/models"
+	"git.sr.ht/~rjarry/aerc/worker/lib"
+	"git.sr.ht/~rjarry/aerc/worker/types"
 )
 
 // This is an abstraction for viewing a message with semi-transparent PGP
diff --git a/lib/msgstore.go b/lib/msgstore.go
index 7af9fd2..b1faa73 100644
--- a/lib/msgstore.go
+++ b/lib/msgstore.go
@@ -4,9 +4,9 @@ import (
 	"io"
 	"time"
 
-	"git.sr.ht/~sircmpwn/aerc/lib/sort"
-	"git.sr.ht/~sircmpwn/aerc/models"
-	"git.sr.ht/~sircmpwn/aerc/worker/types"
+	"git.sr.ht/~rjarry/aerc/lib/sort"
+	"git.sr.ht/~rjarry/aerc/models"
+	"git.sr.ht/~rjarry/aerc/worker/types"
 )
 
 // Accesses to fields must be guarded by MessageStore.Lock/Unlock
diff --git a/lib/sort/sort.go b/lib/sort/sort.go
index 840f77e..c7e2b8c 100644
--- a/lib/sort/sort.go
+++ b/lib/sort/sort.go
@@ -6,7 +6,7 @@ import (
 	"sort"
 	"strings"
 
-	"git.sr.ht/~sircmpwn/aerc/worker/types"
+	"git.sr.ht/~rjarry/aerc/worker/types"
 )
 
 func GetSortCriteria(args []string) ([]*types.SortCriterion, error) {
diff --git a/lib/structure_helpers.go b/lib/structure_helpers.go
index 4abf304..95719dd 100644
--- a/lib/structure_helpers.go
+++ b/lib/structure_helpers.go
@@ -3,7 +3,7 @@ package lib
 import (
 	"strings"
 
-	"git.sr.ht/~sircmpwn/aerc/models"
+	"git.sr.ht/~rjarry/aerc/models"
 )
 
 func FindPlaintext(bs *models.BodyStructure, path []int) []int {
diff --git a/lib/templates/template.go b/lib/templates/template.go
index 197f159..6d66d8e 100644
--- a/lib/templates/template.go
+++ b/lib/templates/template.go
@@ -13,7 +13,7 @@ import (
 
 	"github.com/emersion/go-message/mail"
 
-	"git.sr.ht/~sircmpwn/aerc/models"
+	"git.sr.ht/~rjarry/aerc/models"
 	"github.com/mitchellh/go-homedir"
 )
 
diff --git a/lib/ui/borders.go b/lib/ui/borders.go
index fd49e7f..1b69a8e 100644
--- a/lib/ui/borders.go
+++ b/lib/ui/borders.go
@@ -3,7 +3,7 @@ package ui
 import (
 	"github.com/gdamore/tcell/v2"
 
-	"git.sr.ht/~sircmpwn/aerc/config"
+	"git.sr.ht/~rjarry/aerc/config"
 )
 
 const (
diff --git a/lib/ui/stack.go b/lib/ui/stack.go
index 5371408..d372235 100644
--- a/lib/ui/stack.go
+++ b/lib/ui/stack.go
@@ -3,7 +3,7 @@ package ui
 import (
 	"fmt"
 
-	"git.sr.ht/~sircmpwn/aerc/config"
+	"git.sr.ht/~rjarry/aerc/config"
 
 	"github.com/gdamore/tcell/v2"
 )
diff --git a/lib/ui/tab.go b/lib/ui/tab.go
index 2cd8828..07f6199 100644
--- a/lib/ui/tab.go
+++ b/lib/ui/tab.go
@@ -6,7 +6,7 @@ import (
 	"github.com/gdamore/tcell/v2"
 	"github.com/mattn/go-runewidth"
 
-	"git.sr.ht/~sircmpwn/aerc/config"
+	"git.sr.ht/~rjarry/aerc/config"
 )
 
 type Tabs struct {
diff --git a/lib/ui/textinput.go b/lib/ui/textinput.go
index d179bce..9daae3a 100644
--- a/lib/ui/textinput.go
+++ b/lib/ui/textinput.go
@@ -7,7 +7,7 @@ import (
 	"github.com/gdamore/tcell/v2"
 	"github.com/mattn/go-runewidth"
 
-	"git.sr.ht/~sircmpwn/aerc/config"
+	"git.sr.ht/~rjarry/aerc/config"
 )
 
 // TODO: Attach history providers
diff --git a/widgets/account-wizard.go b/widgets/account-wizard.go
index 6402c0b..5c15a11 100644
--- a/widgets/account-wizard.go
+++ b/widgets/account-wizard.go
@@ -15,8 +15,8 @@ import (
 	"github.com/go-ini/ini"
 	"github.com/kyoh86/xdg"
 
-	"git.sr.ht/~sircmpwn/aerc/config"
-	"git.sr.ht/~sircmpwn/aerc/lib/ui"
+	"git.sr.ht/~rjarry/aerc/config"
+	"git.sr.ht/~rjarry/aerc/lib/ui"
 )
 
 const (
diff --git a/widgets/account.go b/widgets/account.go
index fc746a4..891278a 100644
--- a/widgets/account.go
+++ b/widgets/account.go
@@ -7,13 +7,13 @@ import (
 
 	"github.com/gdamore/tcell/v2"
 
-	"git.sr.ht/~sircmpwn/aerc/config"
-	"git.sr.ht/~sircmpwn/aerc/lib"
-	"git.sr.ht/~sircmpwn/aerc/lib/sort"
-	"git.sr.ht/~sircmpwn/aerc/lib/ui"
-	"git.sr.ht/~sircmpwn/aerc/models"
-	"git.sr.ht/~sircmpwn/aerc/worker"
-	"git.sr.ht/~sircmpwn/aerc/worker/types"
+	"git.sr.ht/~rjarry/aerc/config"
+	"git.sr.ht/~rjarry/aerc/lib"
+	"git.sr.ht/~rjarry/aerc/lib/sort"
+	"git.sr.ht/~rjarry/aerc/lib/ui"
+	"git.sr.ht/~rjarry/aerc/models"
+	"git.sr.ht/~rjarry/aerc/worker"
+	"git.sr.ht/~rjarry/aerc/worker/types"
 )
 
 var _ ProvidesMessages = (*AccountView)(nil)
diff --git a/widgets/aerc.go b/widgets/aerc.go
index 7ee2c3b..cbde56c 100644
--- a/widgets/aerc.go
+++ b/widgets/aerc.go
@@ -14,10 +14,10 @@ import (
 	"github.com/google/shlex"
 	"golang.org/x/crypto/openpgp"
 
-	"git.sr.ht/~sircmpwn/aerc/config"
-	"git.sr.ht/~sircmpwn/aerc/lib"
-	"git.sr.ht/~sircmpwn/aerc/lib/ui"
-	"git.sr.ht/~sircmpwn/aerc/models"
+	"git.sr.ht/~rjarry/aerc/config"
+	"git.sr.ht/~rjarry/aerc/lib"
+	"git.sr.ht/~rjarry/aerc/lib/ui"
+	"git.sr.ht/~rjarry/aerc/models"
 )
 
 type Aerc struct {
diff --git a/widgets/common.go b/widgets/common.go
index e1cee05..f77f891 100644
--- a/widgets/common.go
+++ b/widgets/common.go
@@ -3,8 +3,8 @@ package widgets
 import (
 	"fmt"
 
-	"git.sr.ht/~sircmpwn/aerc/lib"
-	"git.sr.ht/~sircmpwn/aerc/models"
+	"git.sr.ht/~rjarry/aerc/lib"
+	"git.sr.ht/~rjarry/aerc/models"
 )
 
 func msgInfoFromUids(store *lib.MessageStore, uids []uint32) ([]*models.MessageInfo, error) {
diff --git a/widgets/compose.go b/widgets/compose.go
index f4320a1..7233d30 100644
--- a/widgets/compose.go
+++ b/widgets/compose.go
@@ -21,13 +21,13 @@ import (
 	"github.com/mitchellh/go-homedir"
 	"github.com/pkg/errors"
 
-	"git.sr.ht/~sircmpwn/aerc/completer"
-	"git.sr.ht/~sircmpwn/aerc/config"
-	"git.sr.ht/~sircmpwn/aerc/lib/format"
-	"git.sr.ht/~sircmpwn/aerc/lib/templates"
-	"git.sr.ht/~sircmpwn/aerc/lib/ui"
-	"git.sr.ht/~sircmpwn/aerc/models"
-	"git.sr.ht/~sircmpwn/aerc/worker/types"
+	"git.sr.ht/~rjarry/aerc/completer"
+	"git.sr.ht/~rjarry/aerc/config"
+	"git.sr.ht/~rjarry/aerc/lib/format"
+	"git.sr.ht/~rjarry/aerc/lib/templates"
+	"git.sr.ht/~rjarry/aerc/lib/ui"
+	"git.sr.ht/~rjarry/aerc/models"
+	"git.sr.ht/~rjarry/aerc/worker/types"
 )
 
 type Composer struct {
diff --git a/widgets/dirlist.go b/widgets/dirlist.go
index 75a3297..4db80a4 100644
--- a/widgets/dirlist.go
+++ b/widgets/dirlist.go
@@ -10,12 +10,12 @@ import (
 	"github.com/gdamore/tcell/v2"
 	"github.com/mattn/go-runewidth"
 
-	"git.sr.ht/~sircmpwn/aerc/config"
-	"git.sr.ht/~sircmpwn/aerc/lib"
-	libsort "git.sr.ht/~sircmpwn/aerc/lib/sort"
-	"git.sr.ht/~sircmpwn/aerc/lib/ui"
-	"git.sr.ht/~sircmpwn/aerc/models"
-	"git.sr.ht/~sircmpwn/aerc/worker/types"
+	"git.sr.ht/~rjarry/aerc/config"
+	"git.sr.ht/~rjarry/aerc/lib"
+	libsort "git.sr.ht/~rjarry/aerc/lib/sort"
+	"git.sr.ht/~rjarry/aerc/lib/ui"
+	"git.sr.ht/~rjarry/aerc/models"
+	"git.sr.ht/~rjarry/aerc/worker/types"
 )
 
 type DirectoryList struct {
diff --git a/widgets/exline.go b/widgets/exline.go
index 24c39c1..dd9c928 100644
--- a/widgets/exline.go
+++ b/widgets/exline.go
@@ -3,9 +3,9 @@ package widgets
 import (
 	"github.com/gdamore/tcell/v2"
 
-	"git.sr.ht/~sircmpwn/aerc/config"
-	"git.sr.ht/~sircmpwn/aerc/lib"
-	"git.sr.ht/~sircmpwn/aerc/lib/ui"
+	"git.sr.ht/~rjarry/aerc/config"
+	"git.sr.ht/~rjarry/aerc/lib"
+	"git.sr.ht/~rjarry/aerc/lib/ui"
 )
 
 type ExLine struct {
diff --git a/widgets/getpasswd.go b/widgets/getpasswd.go
index b5c3d0e..0a03f7d 100644
--- a/widgets/getpasswd.go
+++ b/widgets/getpasswd.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/gdamore/tcell/v2"
 
-	"git.sr.ht/~sircmpwn/aerc/config"
-	"git.sr.ht/~sircmpwn/aerc/lib/ui"
+	"git.sr.ht/~rjarry/aerc/config"
+	"git.sr.ht/~rjarry/aerc/lib/ui"
 )
 
 type GetPasswd struct {
diff --git a/widgets/headerlayout.go b/widgets/headerlayout.go
index 904b079..8113cf8 100644
--- a/widgets/headerlayout.go
+++ b/widgets/headerlayout.go
@@ -1,8 +1,8 @@
 package widgets
 
 import (
-	"git.sr.ht/~sircmpwn/aerc/lib/ui"
-	"git.sr.ht/~sircmpwn/aerc/models"
+	"git.sr.ht/~rjarry/aerc/lib/ui"
+	"git.sr.ht/~rjarry/aerc/models"
 )
 
 type HeaderLayout [][]string
diff --git a/widgets/msglist.go b/widgets/msglist.go
index 6055da3..79f0508 100644
--- a/widgets/msglist.go
+++ b/widgets/msglist.go
@@ -8,11 +8,11 @@ import (
 	"github.com/gdamore/tcell/v2"
 	"github.com/mattn/go-runewidth"
 
-	"git.sr.ht/~sircmpwn/aerc/config"
-	"git.sr.ht/~sircmpwn/aerc/lib"
-	"git.sr.ht/~sircmpwn/aerc/lib/format"
-	"git.sr.ht/~sircmpwn/aerc/lib/ui"
-	"git.sr.ht/~sircmpwn/aerc/models"
+	"git.sr.ht/~rjarry/aerc/config"
+	"git.sr.ht/~rjarry/aerc/lib"
+	"git.sr.ht/~rjarry/aerc/lib/format"
+	"git.sr.ht/~rjarry/aerc/lib/ui"
+	"git.sr.ht/~rjarry/aerc/models"
 )
 
 type MessageList struct {
diff --git a/widgets/msgviewer.go b/widgets/msgviewer.go
index 87deac4..b1decd5 100644
--- a/widgets/msgviewer.go
+++ b/widgets/msgviewer.go
@@ -15,11 +15,11 @@ import (
 	"github.com/google/shlex"
 	"github.com/mattn/go-runewidth"
 
-	"git.sr.ht/~sircmpwn/aerc/config"
-	"git.sr.ht/~sircmpwn/aerc/lib"
-	"git.sr.ht/~sircmpwn/aerc/lib/format"
-	"git.sr.ht/~sircmpwn/aerc/lib/ui"
-	"git.sr.ht/~sircmpwn/aerc/models"
+	"git.sr.ht/~rjarry/aerc/config"
+	"git.sr.ht/~rjarry/aerc/lib"
+	"git.sr.ht/~rjarry/aerc/lib/format"
+	"git.sr.ht/~rjarry/aerc/lib/ui"
+	"git.sr.ht/~rjarry/aerc/models"
 )
 
 var ansi = regexp.MustCompile("\x1B\\[[0-?]*[ -/]*[@-~]")
diff --git a/widgets/pgpinfo.go b/widgets/pgpinfo.go
index 94fb877..febf29a 100644
--- a/widgets/pgpinfo.go
+++ b/widgets/pgpinfo.go
@@ -3,8 +3,8 @@ package widgets
 import (
 	"errors"
 
-	"git.sr.ht/~sircmpwn/aerc/config"
-	"git.sr.ht/~sircmpwn/aerc/lib/ui"
+	"git.sr.ht/~rjarry/aerc/config"
+	"git.sr.ht/~rjarry/aerc/lib/ui"
 
 	"golang.org/x/crypto/openpgp"
 	pgperrors "golang.org/x/crypto/openpgp/errors"
diff --git a/widgets/providesmessage.go b/widgets/providesmessage.go
index 6e00b1c..c1d821c 100644
--- a/widgets/providesmessage.go
+++ b/widgets/providesmessage.go
@@ -1,9 +1,9 @@
 package widgets
 
 import (
-	"git.sr.ht/~sircmpwn/aerc/lib"
-	"git.sr.ht/~sircmpwn/aerc/lib/ui"
-	"git.sr.ht/~sircmpwn/aerc/models"
+	"git.sr.ht/~rjarry/aerc/lib"
+	"git.sr.ht/~rjarry/aerc/lib/ui"
+	"git.sr.ht/~rjarry/aerc/models"
 )
 
 type PartInfo struct {
diff --git a/widgets/selector.go b/widgets/selector.go
index 196601b..e773c93 100644
--- a/widgets/selector.go
+++ b/widgets/selector.go
@@ -3,8 +3,8 @@ package widgets
 import (
 	"github.com/gdamore/tcell/v2"
 
-	"git.sr.ht/~sircmpwn/aerc/config"
-	"git.sr.ht/~sircmpwn/aerc/lib/ui"
+	"git.sr.ht/~rjarry/aerc/config"
+	"git.sr.ht/~rjarry/aerc/lib/ui"
 )
 
 type Selector struct {
diff --git a/widgets/spinner.go b/widgets/spinner.go
index f49256a..2bd416a 100644
--- a/widgets/spinner.go
+++ b/widgets/spinner.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/gdamore/tcell/v2"
 
-	"git.sr.ht/~sircmpwn/aerc/config"
-	"git.sr.ht/~sircmpwn/aerc/lib/ui"
+	"git.sr.ht/~rjarry/aerc/config"
+	"git.sr.ht/~rjarry/aerc/lib/ui"
 )
 
 type Spinner struct {
diff --git a/widgets/status.go b/widgets/status.go
index dfad08c..c70d215 100644
--- a/widgets/status.go
+++ b/widgets/status.go
@@ -6,8 +6,8 @@ import (
 	"github.com/gdamore/tcell/v2"
 	"github.com/mattn/go-runewidth"
 
-	"git.sr.ht/~sircmpwn/aerc/config"
-	"git.sr.ht/~sircmpwn/aerc/lib/ui"
+	"git.sr.ht/~rjarry/aerc/config"
+	"git.sr.ht/~rjarry/aerc/lib/ui"
 )
 
 type StatusLine struct {
diff --git a/widgets/terminal.go b/widgets/terminal.go
index 920c312..2a1afa5 100644
--- a/widgets/terminal.go
+++ b/widgets/terminal.go
@@ -6,7 +6,7 @@ import (
 	"sync"
 	"syscall"
 
-	"git.sr.ht/~sircmpwn/aerc/lib/ui"
+	"git.sr.ht/~rjarry/aerc/lib/ui"
 
 	"github.com/creack/pty"
 	vterm "github.com/ddevault/go-libvterm"
diff --git a/worker/handler_notmuch.go b/worker/handler_notmuch.go
index b1e210c..5e9c166 100644
--- a/worker/handler_notmuch.go
+++ b/worker/handler_notmuch.go
@@ -2,4 +2,4 @@
 
 package worker
 
-import _ "git.sr.ht/~sircmpwn/aerc/worker/notmuch"
+import _ "git.sr.ht/~rjarry/aerc/worker/notmuch"
diff --git a/worker/handlers/register.go b/worker/handlers/register.go
index 5e8463e..c871f07 100644
--- a/worker/handlers/register.go
+++ b/worker/handlers/register.go
@@ -3,7 +3,7 @@ package handlers
 import (
 	"fmt"
 
-	"git.sr.ht/~sircmpwn/aerc/worker/types"
+	"git.sr.ht/~rjarry/aerc/worker/types"
 )
 
 type FactoryFunc func(*types.Worker) (types.Backend, error)
diff --git a/worker/imap/create.go b/worker/imap/create.go
index 6ce71ef..4cc5c5a 100644
--- a/worker/imap/create.go
+++ b/worker/imap/create.go
@@ -1,7 +1,7 @@
 package imap
 
 import (
-	"git.sr.ht/~sircmpwn/aerc/worker/types"
+	"git.sr.ht/~rjarry/aerc/worker/types"
 )
 
 func (imapw *IMAPWorker) handleCreateDirectory(msg *types.CreateDirectory) {
diff --git a/worker/imap/fetch.go b/worker/imap/fetch.go
index def0da8..c63ee42 100644
--- a/worker/imap/fetch.go
+++ b/worker/imap/fetch.go
@@ -10,8 +10,8 @@ import (
 	"github.com/emersion/go-message/mail"
 	"github.com/emersion/go-message/textproto"
 
-	"git.sr.ht/~sircmpwn/aerc/models"
-	"git.sr.ht/~sircmpwn/aerc/worker/types"
+	"git.sr.ht/~rjarry/aerc/models"
+	"git.sr.ht/~rjarry/aerc/worker/types"
 )
 
 func (imapw *IMAPWorker) handleFetchMessageHeaders(
diff --git a/worker/imap/flags.go b/worker/imap/flags.go
index aef1019..7ab82f2 100644
--- a/worker/imap/flags.go
+++ b/worker/imap/flags.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"github.com/emersion/go-imap"
 
-	"git.sr.ht/~sircmpwn/aerc/worker/types"
+	"git.sr.ht/~rjarry/aerc/worker/types"
 )
 
 func (imapw *IMAPWorker) handleDeleteMessages(msg *types.DeleteMessages) {
diff --git a/worker/imap/imap.go b/worker/imap/imap.go
index 29dbc10..93b8a94 100644
--- a/worker/imap/imap.go
+++ b/worker/imap/imap.go
@@ -3,7 +3,7 @@ package imap
 import (
 	"github.com/emersion/go-imap"
 
-	"git.sr.ht/~sircmpwn/aerc/models"
+	"git.sr.ht/~rjarry/aerc/models"
 	"github.com/emersion/go-message/charset"
 	"github.com/emersion/go-message/mail"
 )
diff --git a/worker/imap/list.go b/worker/imap/list.go
index e69fc07..9cff2c4 100644
--- a/worker/imap/list.go
+++ b/worker/imap/list.go
@@ -3,8 +3,8 @@ package imap
 import (
 	"github.com/emersion/go-imap"
 
-	"git.sr.ht/~sircmpwn/aerc/models"
-	"git.sr.ht/~sircmpwn/aerc/worker/types"
+	"git.sr.ht/~rjarry/aerc/models"
+	"git.sr.ht/~rjarry/aerc/worker/types"
 )
 
 func (imapw *IMAPWorker) handleListDirectories(msg *types.ListDirectories) {
diff --git a/worker/imap/movecopy.go b/worker/imap/movecopy.go
index a53c7d4..38f23ab 100644
--- a/worker/imap/movecopy.go
+++ b/worker/imap/movecopy.go
@@ -3,7 +3,7 @@ package imap
 import (
 	"io"
 
-	"git.sr.ht/~sircmpwn/aerc/worker/types"
+	"git.sr.ht/~rjarry/aerc/worker/types"
 )
 
 func (imapw *IMAPWorker) handleCopyMessages(msg *types.CopyMessages) {
diff --git a/worker/imap/open.go b/worker/imap/open.go
index 0a0d9fe..4b4e943 100644
--- a/worker/imap/open.go
+++ b/worker/imap/open.go
@@ -4,7 +4,7 @@ import (
 	"github.com/emersion/go-imap"
 	sortthread "github.com/emersion/go-imap-sortthread"
 
-	"git.sr.ht/~sircmpwn/aerc/worker/types"
+	"git.sr.ht/~rjarry/aerc/worker/types"
 )
 
 func (imapw *IMAPWorker) handleOpenDirectory(msg *types.OpenDirectory) {
diff --git a/worker/imap/remove.go b/worker/imap/remove.go
index 47b1f43..aff36be 100644
--- a/worker/imap/remove.go
+++ b/worker/imap/remove.go
@@ -1,7 +1,7 @@
 package imap
 
 import (
-	"git.sr.ht/~sircmpwn/aerc/worker/types"
+	"git.sr.ht/~rjarry/aerc/worker/types"
 )
 
 func (imapw *IMAPWorker) handleRemoveDirectory(msg *types.RemoveDirectory) {
diff --git a/worker/imap/worker.go b/worker/imap/worker.go
index 7e00966..82b81bd 100644
--- a/worker/imap/worker.go
+++ b/worker/imap/worker.go
@@ -11,10 +11,10 @@ import (
 	"github.com/emersion/go-imap/client"
 	"golang.org/x/oauth2"
 
-	"git.sr.ht/~sircmpwn/aerc/lib"
-	"git.sr.ht/~sircmpwn/aerc/models"
-	"git.sr.ht/~sircmpwn/aerc/worker/handlers"
-	"git.sr.ht/~sircmpwn/aerc/worker/types"
+	"git.sr.ht/~rjarry/aerc/lib"
+	"git.sr.ht/~rjarry/aerc/models"
+	"git.sr.ht/~rjarry/aerc/worker/handlers"
+	"git.sr.ht/~rjarry/aerc/worker/types"
 )
 
 func init() {
diff --git a/worker/lib/parse.go b/worker/lib/parse.go
index efdb60f..87f94bd 100644
--- a/worker/lib/parse.go
+++ b/worker/lib/parse.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"time"
 
-	"git.sr.ht/~sircmpwn/aerc/models"
+	"git.sr.ht/~rjarry/aerc/models"
 	"github.com/emersion/go-message"
 	_ "github.com/emersion/go-message/charset"
 	"github.com/emersion/go-message/mail"
diff --git a/worker/lib/parse_test.go b/worker/lib/parse_test.go
index a0b4ab2..5c0a1b1 100644
--- a/worker/lib/parse_test.go
+++ b/worker/lib/parse_test.go
@@ -7,7 +7,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"git.sr.ht/~sircmpwn/aerc/models"
+	"git.sr.ht/~rjarry/aerc/models"
 )
 
 func TestMessageInfoHandledError(t *testing.T) {
diff --git a/worker/lib/sort.go b/worker/lib/sort.go
index 09bcf77..958cbed 100644
--- a/worker/lib/sort.go
+++ b/worker/lib/sort.go
@@ -4,8 +4,8 @@ import (
 	"sort"
 	"strings"
 
-	"git.sr.ht/~sircmpwn/aerc/models"
-	"git.sr.ht/~sircmpwn/aerc/worker/types"
+	"git.sr.ht/~rjarry/aerc/models"
+	"git.sr.ht/~rjarry/aerc/worker/types"
 	"github.com/emersion/go-message/mail"
 )
 
diff --git a/worker/maildir/container.go b/worker/maildir/container.go
index 1bdc4e7..6f7d74a 100644
--- a/worker/maildir/container.go
+++ b/worker/maildir/container.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/emersion/go-maildir"
 
-	"git.sr.ht/~sircmpwn/aerc/lib/uidstore"
+	"git.sr.ht/~rjarry/aerc/lib/uidstore"
 )
 
 // A Container is a directory which contains other directories which adhere to
diff --git a/worker/maildir/message.go b/worker/maildir/message.go
index b3c2e8f..dbc9ade 100644
--- a/worker/maildir/message.go
+++ b/worker/maildir/message.go
@@ -8,8 +8,8 @@ import (
 	"github.com/emersion/go-maildir"
 	"github.com/emersion/go-message"
 
-	"git.sr.ht/~sircmpwn/aerc/models"
-	"git.sr.ht/~sircmpwn/aerc/worker/lib"
+	"git.sr.ht/~rjarry/aerc/models"
+	"git.sr.ht/~rjarry/aerc/worker/lib"
 )
 
 // A Message is an individual email inside of a maildir.Dir.
diff --git a/worker/maildir/search.go b/worker/maildir/search.go
index ad3a45f..edfb8d8 100644
--- a/worker/maildir/search.go
+++ b/worker/maildir/search.go
@@ -10,8 +10,8 @@ import (
 
 	"git.sr.ht/~sircmpwn/getopt"
 
-	"git.sr.ht/~sircmpwn/aerc/lib"
-	"git.sr.ht/~sircmpwn/aerc/models"
+	"git.sr.ht/~rjarry/aerc/lib"
+	"git.sr.ht/~rjarry/aerc/models"
 )
 
 type searchCriteria struct {
diff --git a/worker/maildir/worker.go b/worker/maildir/worker.go
index 3f84e01..5888f11 100644
--- a/worker/maildir/worker.go
+++ b/worker/maildir/worker.go
@@ -11,10 +11,10 @@ import (
 	"github.com/emersion/go-maildir"
 	"github.com/fsnotify/fsnotify"
 
-	"git.sr.ht/~sircmpwn/aerc/models"
-	"git.sr.ht/~sircmpwn/aerc/worker/handlers"
-	"git.sr.ht/~sircmpwn/aerc/worker/lib"
-	"git.sr.ht/~sircmpwn/aerc/worker/types"
+	"git.sr.ht/~rjarry/aerc/models"
+	"git.sr.ht/~rjarry/aerc/worker/handlers"
+	"git.sr.ht/~rjarry/aerc/worker/lib"
+	"git.sr.ht/~rjarry/aerc/worker/types"
 )
 
 func init() {
diff --git a/worker/notmuch/message.go b/worker/notmuch/message.go
index 10fbabc..41bfd0b 100644
--- a/worker/notmuch/message.go
+++ b/worker/notmuch/message.go
@@ -8,9 +8,9 @@ import (
 	"io"
 	"os"
 
-	"git.sr.ht/~sircmpwn/aerc/models"
-	"git.sr.ht/~sircmpwn/aerc/worker/lib"
-	notmuch "git.sr.ht/~sircmpwn/aerc/worker/notmuch/lib"
+	"git.sr.ht/~rjarry/aerc/models"
+	"git.sr.ht/~rjarry/aerc/worker/lib"
+	notmuch "git.sr.ht/~rjarry/aerc/worker/notmuch/lib"
 	"github.com/emersion/go-message"
 	_ "github.com/emersion/go-message/charset"
 )
diff --git a/worker/notmuch/worker.go b/worker/notmuch/worker.go
index 637bb4d..f8f8b11 100644
--- a/worker/notmuch/worker.go
+++ b/worker/notmuch/worker.go
@@ -11,13 +11,13 @@ import (
 	"strings"
 	"time"
 
-	"git.sr.ht/~sircmpwn/aerc/config"
-	"git.sr.ht/~sircmpwn/aerc/lib/uidstore"
-	"git.sr.ht/~sircmpwn/aerc/models"
-	"git.sr.ht/~sircmpwn/aerc/worker/handlers"
-	"git.sr.ht/~sircmpwn/aerc/worker/lib"
-	notmuch "git.sr.ht/~sircmpwn/aerc/worker/notmuch/lib"
-	"git.sr.ht/~sircmpwn/aerc/worker/types"
+	"git.sr.ht/~rjarry/aerc/config"
+	"git.sr.ht/~rjarry/aerc/lib/uidstore"
+	"git.sr.ht/~rjarry/aerc/models"
+	"git.sr.ht/~rjarry/aerc/worker/handlers"
+	"git.sr.ht/~rjarry/aerc/worker/lib"
+	notmuch "git.sr.ht/~rjarry/aerc/worker/notmuch/lib"
+	"git.sr.ht/~rjarry/aerc/worker/types"
 	"github.com/mitchellh/go-homedir"
 )
 
diff --git a/worker/types/messages.go b/worker/types/messages.go
index ab0e545..599e870 100644
--- a/worker/types/messages.go
+++ b/worker/types/messages.go
@@ -4,8 +4,8 @@ import (
 	"io"
 	"time"
 
-	"git.sr.ht/~sircmpwn/aerc/config"
-	"git.sr.ht/~sircmpwn/aerc/models"
+	"git.sr.ht/~rjarry/aerc/config"
+	"git.sr.ht/~rjarry/aerc/models"
 )
 
 type WorkerMessage interface {
diff --git a/worker/worker.go b/worker/worker.go
index f1f47c3..f65f0e3 100644
--- a/worker/worker.go
+++ b/worker/worker.go
@@ -6,8 +6,8 @@ import (
 	"net/url"
 	"strings"
 
-	"git.sr.ht/~sircmpwn/aerc/worker/handlers"
-	"git.sr.ht/~sircmpwn/aerc/worker/types"
+	"git.sr.ht/~rjarry/aerc/worker/handlers"
+	"git.sr.ht/~rjarry/aerc/worker/types"
 )
 
 // Guesses the appropriate worker type based on the given source string
diff --git a/worker/worker_enabled.go b/worker/worker_enabled.go
index 4fba729..f0b9dbc 100644
--- a/worker/worker_enabled.go
+++ b/worker/worker_enabled.go
@@ -1,5 +1,5 @@
 package worker
 
 // the following workers are always enabled
-import _ "git.sr.ht/~sircmpwn/aerc/worker/imap"
-import _ "git.sr.ht/~sircmpwn/aerc/worker/maildir"
+import _ "git.sr.ht/~rjarry/aerc/worker/imap"
+import _ "git.sr.ht/~rjarry/aerc/worker/maildir"