Moving the System Error Messages

Dear Jim,
- You on folder: templates/osprealestate/tpls/blocks/mainbody: one-sidebar-right.php
line 19 remove:
<?php if($this->hasMessage()) : ?>
<jdoc:include type="message" />
<?php endif ?>
- You on folder: templates/osprealestate/tpls/blocks:mainnav.php
line 70 add:
<?php if($this->hasMessage()) : ?>
<div class="container">
<jdoc:include type="message" />
</div>
<?php endif ?>
Thanks
Truong

Hi Truong,
Many thanks thats great. I have done that and it works well. however, i guess the code is also on different templates which i will also have remove? (see below image).
Also.... would it be better to change the code in directly in the templates (via ftp), or using the template manager and 'create overrides ?
I am asking as if i upgrade OS_Property i don't want my changes to be over written, or doesn't it make a difference ?