Merge branch 'master' into hibox

README.md

@@ -35,7 +35,7 @@
 
 ![Rambox](https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/screenshots/mac.png)
 
-## Services available - 80
+## Services available - 81
 
 <img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/whatsapp.png" alt="WhatsApp" title="WhatsApp">
 <img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/messenger.png" alt="Messenger" title="Messenger">
@@ -121,8 +121,10 @@
 <img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/teams.png" alt="Teams" title="Teams">
 <img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/xing.png" alt="Xing" title="Xing">
 <img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/workplace.png" alt="Workplace" title="Workplace">
+<img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/fastmail.png" alt="FastMail" title="FastMail">
 <img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/hibox.png" alt="Hibox" title="Hibox">
 
+
 <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
 
 ## Features

app/store/ServicesList.js

@@ -731,12 +731,20 @@ Ext.define('Rambox.store.ServicesList', {
 			,dont_update_unread_from_title: true
 		},
 		{
-			 id: 'hibox'
+			 id: 'fastmail'
+			,logo: 'fastmail.png'
+			,name: 'FastMail'
+			,description: 'Secure, reliable email hosting for businesses, families and professionals. Premium email with no ads, excellent spam protection and rapid personal support.'
+			,url: 'https://www.fastmail.com/login/'
+			,type: 'mail'
+		},
+    {
+      id: 'hibox'
 			,logo: 'hibox.png'
 			,name: 'Hibox'
 			,description: 'Hibox is a secure and private messaging platform for your business.'
 			,url: 'https://app.hibox.co/'
 			,type: 'messaging'
-		}
+    }
   ]
 });