diff --git a/main/Database.go b/main/Database.go
index 6c75afa..f217862 100644
--- a/main/Database.go
+++ b/main/Database.go
@@ -40,13 +40,13 @@ type dbChange struct {
 }
 
 var tables = []table{
-	table{"mail", "mail TEXT, room INTEGER"},
-	table{"rooms", "pk_id INTEGER PRIMARY KEY AUTOINCREMENT, roomID TEXT, imapAccount INTEGER DEFAULT -1, smtpAccount INTEGER DEFAULT -1, mailCheckInterval INTEGER, isHTMLenabled INTEGER"},
-	table{"imapAccounts", "pk_id INTEGER PRIMARY KEY AUTOINCREMENT, host TEXT, username TEXT, password TEXT, ignoreSSL INTEGER, mailbox TEXT"},
-	table{"smtpAccounts", "pk_id INTEGER PRIMARY KEY AUTOINCREMENT, host TEXT, port int, username TEXT, password TEXT, ignoreSSL INTEGER"},
-	table{"emailWritingTemp", "pk_id INTEGER PRIMARY KEY AUTOINCREMENT, roomID TEXT, receiver TEXT, subject TEXT DEFAULT ' ', body TEXT DEFAULT ' ', markdown INTEGER"},
-	table{"version", "pk_id INTEGER PRIMARY KEY AUTOINCREMENT, version INTEGER"},
-	table{"emailAttachments", "pk_id INTEGER PRIMARY KEY AUTOINCREMENT, writeTempID INTEGER, fileName TEXT"},
+	{"mail", "mail TEXT, room INTEGER"},
+	{"rooms", "pk_id INTEGER PRIMARY KEY AUTOINCREMENT, roomID TEXT, imapAccount INTEGER DEFAULT -1, smtpAccount INTEGER DEFAULT -1, mailCheckInterval INTEGER, isHTMLenabled INTEGER"},
+	{"imapAccounts", "pk_id INTEGER PRIMARY KEY AUTOINCREMENT, host TEXT, username TEXT, password TEXT, ignoreSSL INTEGER, mailbox TEXT"},
+	{"smtpAccounts", "pk_id INTEGER PRIMARY KEY AUTOINCREMENT, host TEXT, port int, username TEXT, password TEXT, ignoreSSL INTEGER"},
+	{"emailWritingTemp", "pk_id INTEGER PRIMARY KEY AUTOINCREMENT, roomID TEXT, receiver TEXT, subject TEXT DEFAULT ' ', body TEXT DEFAULT ' ', markdown INTEGER"},
+	{"version", "pk_id INTEGER PRIMARY KEY AUTOINCREMENT, version INTEGER"},
+	{"emailAttachments", "pk_id INTEGER PRIMARY KEY AUTOINCREMENT, writeTempID INTEGER, fileName TEXT"},
 }
 
 func handleDBVersion() {
@@ -101,9 +101,9 @@ func saveVersion(version int) error {
 }
 
 var dbChanges = []dbChange{
-	dbChange{2, "ALTER TABLE rooms ADD isHTMLenabled INTEGER"},
-	dbChange{2, "UPDATE rooms SET isHTMLenabled=0"},
-	dbChange{7, "CREATE TABLE `blocklist` (`pkID` INTEGER PRIMARY KEY AUTOINCREMENT, `imapAccount` INTEGER, `address` INTEGER);"},
+	{2, "ALTER TABLE rooms ADD isHTMLenabled INTEGER"},
+	{2, "UPDATE rooms SET isHTMLenabled=0"},
+	{7, "CREATE TABLE `blocklist` (`pkID` INTEGER PRIMARY KEY AUTOINCREMENT, `imapAccount` INTEGER, `address` INTEGER);"},
 }
 
 func startDBupgrader(oldVers int) {
diff --git a/main/Main.go b/main/Main.go
index f9f677d..3ba57a9 100644
--- a/main/Main.go
+++ b/main/Main.go
@@ -289,7 +289,7 @@ func startMatrixSync(client *mautrix.Client) {
 							return
 						}
 					} else if evt.Content.AsMessage().MsgType == event.MsgFile || evt.Content.AsMessage().MsgType == event.MsgImage {
-						if strings.HasPrefix(string(evt.Content.AsMessage().URL) , "mxc://") {
+						if strings.HasPrefix(string(evt.Content.AsMessage().URL), "mxc://") {
 							reader, err := client.Download(id.MustParseContentURI(evt.Content.AsMessage().Body))
 							if err != nil {
 								client.SendText(roomID, "Couldn't download File: "+err.Error())
@@ -1048,7 +1048,7 @@ func handleMail(mail *imap.Message, section *imap.BodySectionName, account imapA
 	}
 	from := html.EscapeString(content.from)
 	fmt.Println("attachments: " + content.attachment)
-	headerContent := &event.MessageEventContent {
+	headerContent := &event.MessageEventContent{
 		Format:        event.FormatHTML,
 		Body:          "\r\n────────────────────────────────────\r\n## You've got a new Email from " + from + "\r\n" + "Subject: " + content.subject + "\r\n" + "────────────────────────────────────",
 		FormattedBody: "<br>────────────────────────────────────<br><b> You've got a new Email</b> from <b>" + from + "</b><br>" + "Subject: " + content.subject + "<br>" + "────────────────────────────────────",