diff --git a/mailserver.cf b/mailserver.cf
index 42dbfb8..a27060c 100644
--- a/mailserver.cf
+++ b/mailserver.cf
@@ -31,6 +31,7 @@ vars:
 		"ssl":false,
 		"opendkim":false,
 		"myhostname":"$(sys.host)",
+		"mynetworks":"",
 		"myorigin":"$myhostname",
 		"mydestination":"$myhostname, localhost",
 		"mail_location" : "mbox:~/mail:LAYOUT=maildir++:INBOX=/var/mail/%u:INDEX=~/mail/index:CONTROL=~/mail/control"
@@ -43,6 +44,7 @@ vars:
 
 		"roundcube_db_pass":"roundcube-secret",
 		"roundcube_version":"1.6.4",
+		"roundcube_password_recovery":false,
 
                 "vimb_rememberme_salt":"Xa])o3GwVe-$8>-vz}y<uR/@Nr*tMwA!^O,D~Npj/JBq8:kM=mLLF(UlFhPntV.(",
                 "vimb_password_salt":"1M;C&Mn{4}){:f=VH*99S%dp)lnKdaQ8#;g>~+&D\C!2Ni+_AeocxD^ZhGQz-H/8",
@@ -55,11 +57,20 @@ vars:
 		"vmail_dir":"/var/vmail",
 
                 "vimb_src_tgz":"$(sys.workdir)/data/public/vimbadmin-3.4.1.tar.gz",
-		"php_handler":"$(apache.default_php_handler)"
+		"php_handler":"$(apache.default_php_handler)",
+		"postmaster_mail":"postmaster@$(sys.host)",
+		"webmaster_mail":"webmaster@$(sys.host)"
+		
 	}';
 
+	
+
 	"cfg" data => mergedata(@(default_cfg),@(param_cfg));	
 
+	"roundcube_plugins" string => ifelse(strcmp("$(cfg[roundcube_password_recovery])","true"),
+		"['acl', 'archive', 'attachment_reminder', 'emoticons', 'enigma', 'hide_blockquote', 'identicon', 'jqueryui', 'managesieve', 'markasjunk', 'newmail_notifier', 'password', 'password_recovery', 'vcard_attachments', 'zipdownload']",
+		"['acl', 'archive', 'attachment_reminder', 'emoticons', 'enigma', 'hide_blockquote', 'identicon', 'jqueryui', 'managesieve', 'markasjunk', 'newmail_notifier', 'password', 'vcard_attachments', 'zipdownload']");
+
         "mysql_cfg" data => '{
 		"settings":{
 			"mysqld":{
@@ -84,7 +95,7 @@ vars:
         "vimb_site" data => '{
                 "domain":"$(cfg[vimb_domain])",
                 "aliases":[ ],
-                "email":"7u83@mail.ru",
+                "email":"$(cfg[webmaster_mail])",
                 "disable":false,
 		"doc_root":"$(apache.www_dir)/$(cfg[vimb_domain])/public",
 		"php_handler":"$(cfg[php_handler])",
@@ -119,10 +130,10 @@ Alias /vimbadmin $(apache.www_dir)/$(cfg[vimb_domain])/public
         "roundcube_site" data => '{
                 "domain":"$(cfg[webmail_domain])",
                 "aliases":[ ],
-                "email":"7u83@mail.ru",
+                "email":"$(cfg[webmaster_mail])",
                 "disable":false,
 		"php_handler":"$(cfg[php_handler])",
-		"doc_root":"$(apache.www_dir)/$(cfg[webmail_domain])/public",
+		"doc_root":"$(apache.www_dir)/$(cfg[webmail_domain])/public/",
                 "ssl":true,
                 "raw":"
 		"
@@ -142,16 +153,28 @@ Alias /vimbadmin $(apache.www_dir)/$(cfg[vimb_domain])/public
 		"backup_dir":"$(cfg[backup_dir])/roundcube",
 		"settings":{
 			"imap_host":"\'tls://$(cfg[imap_domain]):143\'",
-			"smtp_host":"\'tls://$(cfg[smtp_domain]):587\'"	
-		}
-
+			"smtp_host":"\'tls://$(cfg[smtp_domain]):587\'",
+			"plugins":"$(roundcube_plugins)"
+		},
+		"keep_installer":true
         }';
 
+	"roundcube_password_recover_cfg" data => '{
+                "db_host":"$(vimb_cfg[db_host])",
+		"db_user":"$(vimb_cfg[db_user])",
+		"db_pass":"$(vimb_cfg[db_pass])",
+		"db_name":"$(vimb_cfg[db_name])",
+		"settings":{
+			"pr_admin_email":"\'$(cfg[postmaster_mail])\'",
+			"pr_replyto_email":"\'$(cfg[postmaster_mail])\'"
+		}	
+	}';
+
 
         "rspamd_site" data => '{
                 "domain" : "$(cfg[rspamd_domain])",
                 "aliases" : [ ],
-                "email": "7u83@mail.ru",
+                "email": "$(cfg[webmaster_mail])",
                 "disable": false,
                 "ssl": true,
                 "doc_root":"$(apache.www_dir)/$(cfg[rspamd_domain])",
@@ -384,13 +407,14 @@ managesieve_max_line_length = 65536
 		]
 		,
 		"main_raw":"
-#debug_peer_level=4
-#debug_peer_list= 5.9.7.163
+debug_peer_level=4
+debug_peer_list=128.140.41.19
 #compatibility_level = 3.8
 myhostname=$(cfg[myhostname])
 mydestination=$(cfg[mydestination])
 alias_maps=$(cfg[alias_maps])
 myorigin=$(cfg[myorigin])
+mynetworks=$(cfg[mynetworks])
 local_recipient_maps = unix:passwd.byname $alias_maps
 
 virtual_transport =  lmtp:unix:private/dovecot-lmtp     
@@ -445,6 +469,8 @@ methods:
 		depends_on => {"aia_roundcube_installed"};
 
 	"any" usebundle => configure_roundcube_password_plugin(@(vimb_cfg));
+	
+	"any" usebundle => roundcube_install_password_recovery_plugin(@(roundcube_password_recover_cfg));
 
 
 	"any" usebundle => install_postfix_pkgs;
@@ -503,7 +529,7 @@ vars:
                 "aliases":[
 			"$(aia_mailserver.cfg[smtp_domain])" 
 		],
-                "email":"7u83@mail.ru",
+                "email":"$(aia_mailserver.cfg[webmaster_mail])",
                 "disable":false,
         }';